summaryrefslogtreecommitdiff
path: root/dir-iterator.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-01-19 19:53:48 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-20 22:18:55 -0800
commit47325e8533a35ee48e85f85543e4f054d21a36c1 (patch)
treef31a14d5b7303fe98e6306ade19285e33f3fc544 /dir-iterator.h
parentmerge-ort: implement apply_dir_rename() and check_dir_renamed() (diff)
downloadtgif-47325e8533a35ee48e85f85543e4f054d21a36c1.tar.xz
merge-ort: implement check_for_directory_rename()
This is copied from merge-recursive.c, with minor tweaks due to using strmap API and the fact that it can use opt->priv->paths to get all pathnames that exist instead of taking a tree object. This depends on a new function, handle_path_level_conflicts(), which just has a placeholder die-not-yet-implemented implementation for now; a subsequent patch will implement it. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir-iterator.h')
0 files changed, 0 insertions, 0 deletions