Browse Source

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
maint
Junio C Hamano 7 years ago
parent
commit
157ee05061
  1. 2
      builtin/pull.c

2
builtin/pull.c

@ -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);
} }

Loading…
Cancel
Save