Hello, Am 11. Juni 2018 um 20:04:19, Junio C Hamano (gitster@xxxxxxxxx(mailto:gitster@xxxxxxxxx)) schrieb: > Leif Middelschulte writes: > > > From: Leif Middelschulte > > > > The output shall behave more similar to ordinary file merges' output to provide > > a more consistent user experience. > > > > Signed-off-by: Leif Middelschulte > > --- > > merge-recursive.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > Thanks, both. Very much appreciated. You are welcome. Thank all of you, who participated in the discussions about this topic, for your patience, advice, and guidance. I am sorry it took me so long to reply and provide the patches. Cheers, Leif > > > > > diff --git a/merge-recursive.c b/merge-recursive.c > > index ac27abbd4..5eb907f46 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 */
