undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/pull: respect verbosity settings in submodules

Browse Source 
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>
This commit is contained in:
Stefan Beller 2018-01-25 11:08:17 -08:00 committed by Junio C Hamano
parent e8906a9019
commit a56771a668
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pull.c
View File

@ -553,6 +553,7 @@ static int rebase_submodules(void)
cp.no_stdin = 1; cp.no_stdin = 1;
argv_array_pushl(&cp.args, "submodule", "update", argv_array_pushl(&cp.args, "submodule", "update",
"--recursive", "--rebase", NULL); "--recursive", "--rebase", NULL);
argv_push_verbosity(&cp.args);
return run_command(&cp); return run_command(&cp);
} }
@ -565,6 +566,7 @@ static int update_submodules(void)
cp.no_stdin = 1; cp.no_stdin = 1;
argv_array_pushl(&cp.args, "submodule", "update", argv_array_pushl(&cp.args, "submodule", "update",
"--recursive", "--checkout", NULL); "--recursive", "--checkout", NULL);
argv_push_verbosity(&cp.args);
return run_command(&cp); return run_command(&cp);
} }