From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jun 2018 19:50:44 +0000 (-0700)
Subject: Merge branch 'sb/submodule-merge-in-merge-recursive'
X-Git-Tag: v2.18.0-rc2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8d0d53a8cf2cc0d68e396df155beba8344d7810f?hp=fb6ac9e79ae47aa55bb1c8b151afa770abd2a601

Merge branch 'sb/submodule-merge-in-merge-recursive'

Finishing touches to a topic that already is in 'master'.

* sb/submodule-merge-in-merge-recursive:
merge-submodule: reduce output verbosity
---

diff --git a/merge-recursive.c b/merge-recursive.c
index ac27abbd4c..5eb907f46e 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1208,7 +1208,7 @@ static int merge_submodule(struct merge_options *o,
 			output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
 			output_commit_title(o, commit_b);
 		} else if (show(o, 2))
-			output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(b));
+			output(o, 2, _("Fast-forwarding submodule %s"), path);
 		else
 			; /* no output */
 
@@ -1220,7 +1220,7 @@ static int merge_submodule(struct merge_options *o,
 			output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
 			output_commit_title(o, commit_a);
 		} else if (show(o, 2))
-			output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(a));
+			output(o, 2, _("Fast-forwarding submodule %s"), path);
 		else
 			; /* no output */