diff mbox series

submodule update: silence underlying fetch with "--quiet"

Message ID 20210430095906.GG9170@etla.org (mailing list archive)
State Accepted
Commit 09bed89b60d3487f6680bec7c08fab16947f6eef
Headers show
Series submodule update: silence underlying fetch with "--quiet" | expand

Commit Message

Nicholas Clark April 30, 2021, 9:59 a.m. UTC
Commands such as

    $ git submodule update --quiet --init --depth=1

involving shallow clones, call the shell function fetch_in_submodule, which
in turn invokes git fetch.  Pass the --quiet option onward there.

Signed-off-by: Nicholas Clark <nick@ccl4.org>
---
I tried to adopt the same approach as the previous commit that fixed a
--quiet bug, 3ad0401e9e (submodule update: silence underlying merge/rebase
with "--quiet", 2020-09-30)

I believe that the bugfix is correct but I struggled to create a concise
regression test demonstrates the bug and the bug fix.

That commit is not the only fix of a --quiet bug, so I'm wondering if there
are others still to find. I looked in git-submodule.sh and see many
invocations of git commands in git-submodule.sh, most of which don't pass
${GIT_QUIET:+--quiet} onward, but I don't know git well enough to know which
might matter (ie might generate output), and it feels like cargo-cult to
add that code unthinkingly to every git command, so I didn't do this.

 git-submodule.sh            |  4 ++--
 t/t7406-submodule-update.sh | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/git-submodule.sh b/git-submodule.sh
index eb90f18229..4678378424 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -420,9 +420,9 @@  fetch_in_submodule () (
 	cd "$1" &&
 	if test $# -eq 3
 	then
-		echo "$3" | git fetch --stdin ${2:+"$2"}
+		echo "$3" | git fetch ${GIT_QUIET:+--quiet} --stdin ${2:+"$2"}
 	else
-		git fetch ${2:+"$2"}
+		git fetch ${GIT_QUIET:+--quiet} ${2:+"$2"}
 	fi
 )
 
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index ff3ba5422e..f4f61fe554 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -1037,4 +1037,28 @@  test_expect_success 'submodule update --quiet passes quietness to merge/rebase'
 	)
 '
 
+test_expect_success 'submodule update --quiet passes quietness to fetch with a shallow clone' '
+	test_when_finished "rm -rf super4 super5 super6" &&
+	git clone . super4 &&
+	(cd super4 &&
+	 git submodule add --quiet file://"$TRASH_DIRECTORY"/submodule submodule3 &&
+	 git commit -am "setup submodule3"
+	) &&
+	(cd submodule &&
+	  test_commit line6 file
+	) &&
+	git clone super4 super5 &&
+	(cd super5 &&
+	 git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
+	 test_must_be_empty out &&
+	 test_must_be_empty err
+	) &&
+	git clone super4 super6 &&
+	(cd super6 &&
+	 git submodule update --init --depth=1 submodule3 >out 2>err &&
+	 test_file_not_empty out &&
+	 test_file_not_empty err
+	)
+'
+
 test_done