]> git.ipfire.org Git - thirdparty/git.git/commit - merge-ort.c
merge-ort: implement check_for_directory_rename()
authorElijah Newren <newren@gmail.com>
Tue, 19 Jan 2021 19:53:48 +0000 (19:53 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2021 06:18:55 +0000 (22:18 -0800)
commit47325e8533a35ee48e85f85543e4f054d21a36c1
treef31a14d5b7303fe98e6306ade19285e33f3fc544
parentfbcfc0cc17019da292c4aeef0fe43a8980207beb
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>
merge-ort.c