mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
sequencer: warn when internal merge may be suboptimal due to renameLimit
When many files were renamed, the recursive merge strategy stopped detecting renames and left many paths with delete/modify conflicts, without any warning about what was going on or providing any hints about how to tell Git to spend more cycles to detect renames. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d8df70f273
commit
b520abf1c8
|
@ -462,6 +462,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
|
||||||
if (is_rebase_i(opts) && clean <= 0)
|
if (is_rebase_i(opts) && clean <= 0)
|
||||||
fputs(o.obuf.buf, stdout);
|
fputs(o.obuf.buf, stdout);
|
||||||
strbuf_release(&o.obuf);
|
strbuf_release(&o.obuf);
|
||||||
|
diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
|
||||||
if (clean < 0)
|
if (clean < 0)
|
||||||
return clean;
|
return clean;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue