builtin/pull: respect verbosity settings in submodules

stefanbeller · gitster · commit a56771a668dd · 2018-01-25T11:19:21.000-08:00
In a6d7eb2 (pull: optionally rebase submodules (remote submodule changes only), 2017-06-23), we taught Git how to rebase submodules in a pull. However we missed to pass on the verbosity settings. Reported-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/pull.c b/builtin/pull.c
@@ -553,6 +553,7 @@ static int rebase_submodules(void)
 	cp.no_stdin = 1;
 	argv_array_pushl(&cp.args, "submodule", "update",
 				   "--recursive", "--rebase", NULL);
+	argv_push_verbosity(&cp.args);
 
 	return run_command(&cp);
 }
@@ -565,6 +566,7 @@ static int update_submodules(void)
 	cp.no_stdin = 1;
 	argv_array_pushl(&cp.args, "submodule", "update",
 				   "--recursive", "--checkout", NULL);
+	argv_push_verbosity(&cp.args);
 
 	return run_command(&cp);
 }

Original file line number	Diff line number	Diff line change
`@@ -553,6 +553,7 @@ static int rebase_submodules(void)`
`553`	`553`	`cp.no_stdin = 1;`
`554`	`554`	`argv_array_pushl(&cp.args, "submodule", "update",`
`555`	`555`	`"--recursive", "--rebase", NULL);`
	`556`	`+ argv_push_verbosity(&cp.args);`
`556`	`557`
`557`	`558`	`return run_command(&cp);`
`558`	`559`	`}`
`@@ -565,6 +566,7 @@ static int update_submodules(void)`
`565`	`566`	`cp.no_stdin = 1;`
`566`	`567`	`argv_array_pushl(&cp.args, "submodule", "update",`
`567`	`568`	`"--recursive", "--checkout", NULL);`
	`569`	`+ argv_push_verbosity(&cp.args);`
`568`	`570`
`569`	`571`	`return run_command(&cp);`
`570`	`572`	`}`