From: Leif Middelschulte Date: Thu, 10 May 2018 18:26:57 GMT Subject: [PATCH 1/1] Warn about fast-forwarding of submodules during merge Message-ID: <20180510182657.65095-2-leif.middelschulte@gmail.com> In-Reply-To: <20180510182657.65095-1-leif.middelschulte@gmail.com> From: Leif Middelschulte Warn 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 --- submodule.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/submodule.c b/submodule.c index 74d35b257..0198a72e6 100644 --- a/submodule.c +++ b/submodule.c @@ -1817,10 +1817,12 @@ int merge_submodule(struct object_id *result, const char *path, /* Case #1: a is contained in b or vice versa */ if (in_merge_bases(commit_a, commit_b)) { oidcpy(result, b); + warning("Fast-forwarding submodule %s", path); return 1; } if (in_merge_bases(commit_b, commit_a)) { oidcpy(result, a); + warning("Fast-forwarding submodule %s", path); return 1; } -- 2.15.1 (Apple Git-101)