From 76f421259718f5f504558e97dfb99e16c9ceb7c6 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Thu, 17 May 2018 11:40:08 -0700 Subject: [PATCH] merge-recursive: give notice when submodule commit gets fast-forwarded Inform the user about an automatically fast-forwarded submodule. The silent merge behavior was introduced by commit 68d03e4a6e44 ("Implement automatic fast-forward merge for submodules", 2010-07-07)). Signed-off-by: Leif Middelschulte Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- merge-recursive.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/merge-recursive.c b/merge-recursive.c index 0571919ee0..a9aecccb8c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1093,10 +1093,26 @@ static int merge_submodule(struct merge_options *o, /* Case #1: a is contained in b or vice versa */ if (in_merge_bases(commit_a, commit_b)) { oidcpy(result, b); + if (show(o, 3)) { + 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)); + else + ; /* no output */ + return 1; } if (in_merge_bases(commit_b, commit_a)) { oidcpy(result, a); + if (show(o, 3)) { + 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)); + else + ; /* no output */ + return 1; } -- 2.47.1