]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: modify collect_renames() for directory rename handling
authorElijah Newren <newren@gmail.com>
Tue, 19 Jan 2021 19:53:45 +0000 (19:53 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2021 06:18:55 +0000 (22:18 -0800)
commitfa5e06d6902003f5f115b7497030b5c66537726e
treec0a9354dfe4409ff86ec1b064ac9e910c07456d9
parent98d0d08128200e244a83d917b63567c30547c36d
merge-ort: modify collect_renames() for directory rename handling

collect_renames() is similar to merge-recursive.c's get_renames(), but
lacks the directory rename handling found in the latter.  Port that code
structure over to merge-ort.  This introduces three new
die-not-yet-implemented functions that will be defined in future
commits.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c