Merge branch 'jk/merge-quiet'

"git merge --quiet" did not squelch messages from the underlying merge-recursive strategy. * jk/merge-quiet: merge: pass verbosity flag down to merge-recursive
git-mirror · Apr 14, 2015 · 3cdff83 · 3cdff83
2 parents f8e593e + 2bf15a3
commit 3cdff83
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -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;