summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-10-05 21:01:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-10-05 21:01:53 (GMT)
commit300cd14ee92eaa0e56688078e967402371488013 (patch)
tree0cfa08aa2f002936cec85f56c97c4b5f25d6ca84
parent19dd352d03adc75d0b6530975a44b7bb23c69063 (diff)
parent3ad0401e9e6d3e243a21a3f376e36453572dcf0d (diff)
downloadgit-300cd14ee92eaa0e56688078e967402371488013.zip
git-300cd14ee92eaa0e56688078e967402371488013.tar.gz
git-300cd14ee92eaa0e56688078e967402371488013.tar.bz2
Merge branch 'td/submodule-update-quiet'
"git submodule update --quiet" did not squelch underlying "rebase" and "pull" commands. * td/submodule-update-quiet: submodule update: silence underlying merge/rebase with "--quiet"
-rwxr-xr-xgit-submodule.sh6
-rwxr-xr-xt/t7406-submodule-update.sh12
2 files changed, 15 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 6fb1258..7ce5287 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -440,7 +440,7 @@ cmd_update()
GIT_QUIET=1
;;
-v)
- GIT_QUIET=0
+ unset GIT_QUIET
;;
--progress)
progress=1
@@ -614,13 +614,13 @@ cmd_update()
say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
;;
rebase)
- command="git rebase"
+ command="git rebase ${GIT_QUIET:+--quiet}"
die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
must_die_on_failure=yes
;;
merge)
- command="git merge"
+ command="git merge ${GIT_QUIET:+--quiet}"
die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
must_die_on_failure=yes
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index aa19ff3..acb8766 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -1022,4 +1022,16 @@ test_expect_success 'git clone passes the parallel jobs config on to submodules'
rm -rf super4
'
+test_expect_success 'submodule update --quiet passes quietness to merge/rebase' '
+ (cd super &&
+ test_commit -C rebasing message &&
+ git submodule update --rebase --quiet >out 2>err &&
+ test_must_be_empty out &&
+ test_must_be_empty err &&
+ git submodule update --rebase -v >out 2>err &&
+ test_file_not_empty out &&
+ test_must_be_empty err
+ )
+'
+
test_done