mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/pull-rebase-submodule'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2018-02-15 14:55:43 -08:00
parent 9db22910f7 a56771a668
commit 157ee05061
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pull.c
View File

@ -574,6 +574,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);
} }
@ -586,6 +587,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);
} }