]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: allow rename detection to be disabled
authorElijah Newren <newren@gmail.com>
Thu, 13 Mar 2025 02:46:37 +0000 (02:46 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2025 16:48:47 +0000 (09:48 -0700)
commita707d4f941c82759d2eb3f1f89fc1e4232df98d1
tree1b4ef6534bc3de463ea538d58e9d9a33a90a1882
parent4e5d9de96c5a9d2202530aaedbf638540811bd58
merge-ort: allow rename detection to be disabled

When merge-ort was written, I did not at first allow rename detection to
be disabled, because I suspected that most folks disabling rename
detection were doing so solely for performance reasons.  Since I put a
lot of working into providing dramatic speedups for rename detection
performance as used by the merge machinery, I wanted to know if there
were still real world repositories where rename detection was
problematic from a performance perspective.  We have had years now to
collect such information, and while we never received one, waiting
longer with the option disabled seems unlikely to help surface such
issues at this point.  Also, there has been at least one request to
allow rename detection to be disabled for behavioral rather than
performance reasons (see the thread including
https://lore.kernel.org/git/CABPp-BG-Nx6SCxxkGXn_Fwd2wseifMFND8eddvWxiZVZk0zRaA@mail.gmail.com/
), so let's start heeding the config and command line settings.

Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.adoc
merge-ort.c
t/t4301-merge-tree-write-tree.sh