зеркало из https://github.com/microsoft/git.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>
This commit is contained in:
Родитель
e8906a9019
Коммит
a56771a668
|
@ -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);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче