summaryrefslogtreecommitdiff
path: root/t/t1406-submodule-ref-store.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-01-19 19:53:49 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-20 22:18:55 -0800
commitbea433655a79b7fbc04444508c55f13ece942a21 (patch)
treec2dacab3b28e8930b665e7c7bd999d64d387e2d9 /t/t1406-submodule-ref-store.sh
parentmerge-ort: implement check_for_directory_rename() (diff)
downloadtgif-bea433655a79b7fbc04444508c55f13ece942a21.tar.xz
merge-ort: implement handle_path_level_conflicts()
This is copied from merge-recursive.c, with minor tweaks due to: * using strmap API * merge-ort not using the non_unique_new_dir field, since it'll obviate its need entirely later with performance improvements * adding a new path_in_way() function that uses opt->priv->paths instead of doing an expensive tree_has_path() lookup to see if a tree has a given path. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1406-submodule-ref-store.sh')
0 files changed, 0 insertions, 0 deletions