summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-08-03 22:25:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-04 16:08:37 (GMT)
commit03c004c581fb0ecd40bf21990449f393934b15ef (patch)
treea88503c206459c608ee08f55f2815eae9c65271c
parentcf8899d285d2648013040ec7196ffd3de0606664 (diff)
downloadgit-03c004c581fb0ecd40bf21990449f393934b15ef.zip
git-03c004c581fb0ecd40bf21990449f393934b15ef.tar.gz
git-03c004c581fb0ecd40bf21990449f393934b15ef.tar.bz2
clone: teach recursive clones to respect -q
Teach 'git clone --recurse-submodules' to respect the '-q' option by passing down the quiet flag to the process which handles cloning of submodules. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/clone.c3
-rwxr-xr-xt/t7400-submodule-basic.sh6
2 files changed, 9 insertions, 0 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index a6ae7d6..f81b123 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -764,6 +764,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 dcac364..e9c3335 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