Propagate --quiet on submodule update to merge/rebase
PATCH v2 1/1 Propagate --quiet on submodule update to merge/rebase
Without this, commands such as
git pull --rebase --recurse-submodules --quiet might produce non-quiet output from the merge or rebase.
Also fix the parsing of git submodule update -v. Setting GIT_QUIET to 0 has the same effect as setting GIT_QUIET to 1, because ${GIT_QUIET:+--quiet} only checks whether GIT_QUIET is set or unset.
--- git-submodule.sh | 6 +++--- t/t7406-submodule-update.sh | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-)
git-submodule.sh +3 -3
@@ -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
t7406-submodule-update.sh +12 -0
@@ -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
Signature · 1 line
2.28.0.709.gb0816b6eb0-goog
Quoted 7 lines · Theodore Dubois
Without this, commands such as
git pull --rebase --recurse-submodules --quiet might produce non-quiet output from the merge or rebase.Also fix the parsing of git submodule update -v. Setting
GIT_QUIETto 0 has the same effect as settingGIT_QUIETto 1, because ${GIT_QUIET:+--quiet} only checks whetherGIT_QUIETis set or unset.
Thanks.
Will queue with the following log message.
submodule update: silence underlying merge/rebase "--quiet" is given
Commands such as
$ git pull --rebase --recurse-submodules --quiet
produce non-quiet output from the merge or rebase. Pass the --quiet option down when invoking "rebase" and "merge".
Also fix the parsing of git submodule update -v.
When e84c3cf3 (git-submodule.sh: accept verbose flag in cmd_update to be non-quiet, 2018-08-14) taught "git submodule update" to take "--quiet", it apparently did not know how ${GIT_QUIET:+--quiet} works, and reviewers seem to have missed that setting the variable to "0" (instead of "1" which is used when "--quiet" is given) has the same effect to pass "--quiet" to underlying commands.
Quoted 3 lines · Junio C Hamano
Will queue with the following log message.
submodule update: silence underlying merge/rebase "--quiet" is given
Probably want to insert "when" in there.
Quoted 7 lines
Commands such as
$ git pull --rebase --recurse-submodules --quiet
produce non-quiet output from the merge or rebase. Pass the --quiet option down when invoking "rebase" and "merge".
Quoted 8 lines
Also fix the parsing of git submodule update -v.
When
e84c3cf3(git-submodule.sh: accept verbose flag incmd_updateto be non-quiet, 2018-08-14) taught "git submodule update" to take "--quiet", it apparently did not know how ${GIT_QUIET:+--quiet} works, and reviewers seem to have missed that setting the variable to "0" (instead of "1" which is used when "--quiet" is given) has the same effect to pass "--quiet" to underlying commands.
Perhaps:
... to "0", rather than unsetting it, still results in "--quiet" being passed to underlying commands.
Jonathan Nieder
Reviewed-byQuoted 10 lines · Junio C Hamano
Quoted 7 lines · Theodore Dubois
Without this, commands such as
git pull --rebase --recurse-submodules --quiet might produce non-quiet output from the merge or rebase.Also fix the parsing of git submodule update -v. Setting
GIT_QUIETto 0 has the same effect as settingGIT_QUIETto 1, because ${GIT_QUIET:+--quiet} only checks whetherGIT_QUIETis set or unset.
Quoted 5 lines
Thanks.
Will queue with the following log message.
submodule update: silence underlying merge/rebase "--quiet" is given
Missing 'when' before '"--quiet"', as Eric noticed.
Aside from that,
Thanks, all.
Quoted 15 lines · Jonathan Nieder
Quoted 14 lines · Junio C Hamano
Quoted 7 lines · Theodore Dubois
Without this, commands such as
git pull --rebase --recurse-submodules --quiet might produce non-quiet output from the merge or rebase.Also fix the parsing of git submodule update -v. Setting
GIT_QUIETto 0 has the same effect as settingGIT_QUIETto 1, because ${GIT_QUIET:+--quiet} only checks whetherGIT_QUIETis set or unset.Thanks.
Will queue with the following log message.
Quoted 8 lines
Quoted 1 line
submodule update: silence underlying merge/rebase "--quiet" is given
Missing 'when' before '"--quiet"', as Eric noticed.
Aside from that,
Reviewed-by Jonathan Nieder <[email protected]>Thanks, all.
I just noticed that our names were on the original change that introduced the broken GIT_QUIET=0; hopefully this time around we did a better job at reviewing the change? ;-)
Thanks.