diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
| commit | 300cd14ee92eaa0e56688078e967402371488013 (patch) | |
| tree | 0cfa08aa2f002936cec85f56c97c4b5f25d6ca84 /t | |
| parent | 19dd352d03adc75d0b6530975a44b7bb23c69063 (diff) | |
| parent | 3ad0401e9e6d3e243a21a3f376e36453572dcf0d (diff) | |
| download | git-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"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7406-submodule-update.sh | 12 |
1 files changed, 12 insertions, 0 deletions
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 |