Merge branch 'bw/clone-recursive-quiet'

gitster · gitster · commit cd2a95245892 · 2017-08-22T10:29:01.000-07:00
"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
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -768,6 +768,9 @@ static int checkout(int submodule_progress)`
`768`	`768`	`if (submodule_progress)`
`769`	`769`	`argv_array_push(&args, "--progress");`
`770`	`770`
	`771`	`+ if (option_verbosity < 0)`
	`772`	`+ argv_array_push(&args, "--quiet");`
	`773`	`+`
`771`	`774`	`err = run_command_v_opt(args.argv, RUN_GIT_CMD);`
`772`	`775`	`argv_array_clear(&args);`
`773`	`776`	`}`