From: Leif Middelschulte Date: Mon, 11 Jun 2018 17:31:28 +0000 (+0200) Subject: merge-submodule: reduce output verbosity X-Git-Tag: v2.18.0-rc2~3^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/40aac22b43c8f9c4cc3acf625fdec3a24368ed4c merge-submodule: reduce output verbosity The output shall behave more similar to ordinary file merges' output to provide a more consistent user experience. Signed-off-by: Leif Middelschulte Signed-off-by: Junio C Hamano --- diff --git a/merge-recursive.c b/merge-recursive.c index a9aecccb8c..11c858d422 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1097,7 +1097,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 */ @@ -1109,7 +1109,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 */