summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-01-25 19:08:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-25 19:19:21 (GMT)
commita56771a668dd4963675914bc5da0e1e015952dae (patch)
tree1571c47de00200bdd75040cdaa02def8765a709d
parente8906a9019799c0761ab5447b67582ffd9bae558 (diff)
downloadgit-a56771a668dd4963675914bc5da0e1e015952dae.zip
git-a56771a668dd4963675914bc5da0e1e015952dae.tar.gz
git-a56771a668dd4963675914bc5da0e1e015952dae.tar.bz2
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>
-rw-r--r--builtin/pull.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 7048fdf..44474fd 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);
}