summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:43 (GMT)
commit157ee050615192d579a358723563e7f785d676ff (patch)
treee9fe8d929b648c027d02e31a864476ecafe72bbd
parent9db22910f74b64764d4fb4e17f8aef4eb5aa6af0 (diff)
parenta56771a668dd4963675914bc5da0e1e015952dae (diff)
downloadgit-157ee050615192d579a358723563e7f785d676ff.zip
git-157ee050615192d579a358723563e7f785d676ff.tar.gz
git-157ee050615192d579a358723563e7f785d676ff.tar.bz2
Merge branch 'sb/pull-rebase-submodule'
"git pull --rebase" did not pass verbosity setting down when recursing into a submodule. * sb/pull-rebase-submodule: builtin/pull: respect verbosity settings in submodules
-rw-r--r--builtin/pull.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 511dbbe..1876271 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -574,6 +574,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);
}
@@ -586,6 +587,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);
}