]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d9d015d) | patch
merge-ort: implement apply_dir_rename() and check_dir_renamed()
authorElijah Newren <newren@gmail.com>
Tue, 19 Jan 2021 19:53:47 +0000 (19:53 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2021 06:18:55 +0000 (22:18 -0800)
commitfbcfc0cc17019da292c4aeef0fe43a8980207beb
tree118577fa4bf860d430d7beedae443f149d5b3b76tree | snapshot
parentd9d015df4a3d794ec889dc70902d28f3ca87d817commit | diff
merge-ort: implement apply_dir_rename() and check_dir_renamed()

Both of these are copied from merge-recursive.c, with just minor tweaks
due to using strmap API and not having a non_unique_new_dir field.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.