diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-16 01:55:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-16 01:55:43 +0300 |
| commit | 157ee050615192d579a358723563e7f785d676ff (patch) | |
| tree | e9fe8d929b648c027d02e31a864476ecafe72bbd /builtin | |
| parent | 9db22910f74b64764d4fb4e17f8aef4eb5aa6af0 (diff) | |
| parent | a56771a668dd4963675914bc5da0e1e015952dae (diff) | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 511dbbe0f6..1876271af9 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); } |