summaryrefslogtreecommitdiff
path: root/t/t4126-apply-empty.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-05-20 06:09:38 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-20 15:40:39 +0900
commitd509802993e8423d459a05fcd6151ca1782caa07 (patch)
treecde77fddcc405bea7cd5fafe06f3e5da3abb6850 /t/t4126-apply-empty.sh
parentmerge-ort: avoid accidental API mis-use (diff)
downloadtgif-d509802993e8423d459a05fcd6151ca1782caa07.tar.xz
merge-ort: preserve cached renames for the appropriate side
Previous commits created an in-memory cache of the results of rename detection, and added logic to detect when that cache could appropriately be used in a subsequent merge operation -- but we were still unconditionally clearing the cache with each new merge operation anyway. If it is valid to reuse the cache from one of the two sides of history, preserve that side. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4126-apply-empty.sh')
0 files changed, 0 insertions, 0 deletions