From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Apr 2015 18:49:12 +0000 (-0700)
Subject: Merge branch 'jk/merge-quiet'
X-Git-Tag: v2.4.0-rc2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3cdff83fb0519bcfed35bca987c59d3557b1f2a7?hp=f8e593e9a71173eb6a813ac5f96e297847262128

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
---

diff --git a/builtin/merge.c b/builtin/merge.c
index 3b0f8f96d4..068a83b328 100644
--- 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;