summaryrefslogtreecommitdiff
path: root/midx.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-05-20 06:09:40 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-20 15:40:39 +0900
commitcbdca289fbb011e7397fecfebeeac3f887ef22d1 (patch)
tree777fce16ad89262da8bb06ff6519b2adcf5a4995 /midx.h
parentmerge-ort: add helper functions for using cached renames (diff)
downloadtgif-cbdca289fbb011e7397fecfebeeac3f887ef22d1.tar.xz
merge-ort: handle interactions of caching and rename/rename(1to1) cases
As documented in Documentation/technical/remembering-renames.txt, and as tested for in the two testcases in t6429 with "rename same file identically" in their description, there is one case where we need to have renames in one commit NOT be cached for the next commit in our rebase sequence -- namely, rename/rename(1to1) cases. Rather than specifically trying to uncache those and fix up dir_rename_counts() to match (which would also be valid but more work), we simply disable the optimization when this really rare type of rename occurs. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'midx.h')
0 files changed, 0 insertions, 0 deletions