Skip to content

Commit b520abf

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d8df70f commit b520abf

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

sequencer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
462462
if (is_rebase_i(opts) && clean <= 0)
463463
fputs(o.obuf.buf, stdout);
464464
strbuf_release(&o.obuf);
465+
diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
465466
if (clean < 0)
466467
return clean;
467468

0 commit comments

Comments
 (0)