diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:49 +0900 |
| commit | 277194a28050c2eabb605994d592d8e46cab6302 (patch) | |
| tree | a2f3f420698e7089230a94ff4b807985c7bd7aa3 | |
| parent | 86c726f0d1ac91a6dacb3ae306d830e9686ae703 (diff) | |
| parent | 03c004c581fb0ecd40bf21990449f393934b15ef (diff) | |
| download | git-277194a28050c2eabb605994d592d8e46cab6302.tar.gz | |
Merge branch 'bw/clone-recursive-quiet' into maint
"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 08b5cc433c..f7e17d2295 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 dcac364c5f..e9c3335b78 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 |