development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/merge-quiet'

Browse source 
"git merge --quiet" did not squelch messages from the underlying
merge-recursive strategy.

* jk/merge-quiet:
  merge: pass verbosity flag down to merge-recursive
This commit is contained in:
Junio C Hamano 2015-04-14 11:49:12 -07:00
parent f8e593e9a7 2bf15a3330
commit 3cdff83fb0
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/merge.c
View file

@ -684,6 +684,10 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
o.subtree_shift = "";
o.renormalize = option_renormalize;
if (verbosity < 0)
o.verbosity = verbosity;
else if (verbosity > 0)
o.verbosity += verbosity;
o.show_rename_progress =
show_progress == -1 ? isatty(2) : show_progress;