[PATCH 1/4] sequencer: Warn when internal merge may be suboptimal due to renameLimit

From: Elijah Newren <newren@gmail.com>
Date: Nov 10, 2017, 17:39 UTC
Message-ID: <20171110173956.25105-2-newren@gmail.com>
In-Reply-To: <20171110173956.25105-1-newren@gmail.com>

Having renamed files silently treated as deleted/modified conflicts instead of correctly resolving the renamed/modified case has caused lots of pain for some users. Eventually, some of them figured out to set merge.renameLimit to something higher, but without feedback about what value it should have, they were just repeatedly guessing and retrying.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 sequencer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sequencer.c b/sequencer.c
index f2a10cc4f2..2b4cecb617 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -462,6 +462,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
 	if (is_rebase_i(opts) && clean <= 0)
 		fputs(o.obuf.buf, stdout);
 	strbuf_release(&o.obuf);
+	diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
 	if (clean < 0)
 		return clean;

-- 
2.15.0.5.g9567be9905