diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:01 -0700 |
| commit | cd2a952458928ccef767cf3555601f07b07b2fb0 (patch) | |
| tree | 6092a56c10e4b6edbc6c961047b124b10f2e99e3 | |
| parent | 5aa0b6c506c1f1336d0e713bf8225509e9ebb9f5 (diff) | |
| parent | 03c004c581fb0ecd40bf21990449f393934b15ef (diff) | |
| download | git-cd2a952458928ccef767cf3555601f07b07b2fb0.tar.gz git-cd2a952458928ccef767cf3555601f07b07b2fb0.tar.xz | |
Merge branch 'bw/clone-recursive-quiet'
"git clone --recurse-submodules --quiet" did not pass the quiet
option down to submodules.
* bw/clone-recursive-quiet:
clone: teach recursive clones to respect -q
| -rw-r--r-- | builtin/clone.c | 3 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 08b5cc433..f7e17d229 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -768,6 +768,9 @@ static int checkout(int submodule_progress) if (submodule_progress) argv_array_push(&args, "--progress"); + if (option_verbosity < 0) + argv_array_push(&args, "--quiet"); + err = run_command_v_opt(args.argv, RUN_GIT_CMD); argv_array_clear(&args); } diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index dcac364c5..e9c3335b7 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -1289,4 +1289,10 @@ test_expect_success 'init properly sets the config' ' test_must_fail git -C multisuper_clone config --get submodule.sub1.active ' +test_expect_success 'recursive clone respects -q' ' + test_when_finished "rm -rf multisuper_clone" && + git clone -q --recurse-submodules multisuper multisuper_clone >actual && + test_must_be_empty actual +' + test_done |