summaryrefslogtreecommitdiff
path: root/cache-tree.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-12-14 16:21:34 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-14 08:45:59 -0800
commitc2d267df0215d49f06638463889465389134021a (patch)
tree02d70a8b7ac7df1ee56b359d2e4af5fa380c4f1d /cache-tree.h
parentmerge-ort: implement compare_pairs() and collect_renames() (diff)
downloadtgif-c2d267df0215d49f06638463889465389134021a.tar.xz
merge-ort: add basic outline for process_renames()
Add code which determines which kind of special rename case each rename corresponds to, but leave the handling of each type unimplemented for now. Future commits will implement each one. There is some tenuous resemblance to merge-recursive's process_renames(), but comparing the two is very unlikely to yield any insights. merge-ort's process_renames() is a bit complex and I would prefer if I could simplify it more, but it is far easier to grok than merge-recursive's function of the same name in my opinion. Plus, merge-ort handles more rename conflict types than merge-recursive does. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.h')
0 files changed, 0 insertions, 0 deletions