From: Stefan Beller <sbeller@google.com>
Date: Thu, 25 Jan 2018 19:08:17 +0000 (-0800)
Subject: builtin/pull: respect verbosity settings in submodules
X-Git-Tag: v2.17.0-rc0~97^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a56771a668dd4963675914bc5da0e1e015952dae;p=thirdparty%2Fgit.git

builtin/pull: respect verbosity settings in submodules

In a6d7eb2c7a (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
index 7048fdf005..44474fdb71 100644
--- 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);
 }