diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:53 -0700 |
| commit | 300cd14ee92eaa0e56688078e967402371488013 (patch) | |
| tree | 0cfa08aa2f002936cec85f56c97c4b5f25d6ca84 | |
| parent | Merge branch 'jk/unused' (diff) | |
| parent | submodule update: silence underlying merge/rebase with "--quiet" (diff) | |
| download | tgif-300cd14ee92eaa0e56688078e967402371488013.tar.xz | |
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-x | git-submodule.sh | 6 | ||||
| -rwxr-xr-x | t/t7406-submodule-update.sh | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 6fb12585cb..7ce52872b7 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 aa19ff3a2e..acb8766ac2 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 |