]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 43e9c4e) | patch
merge-ort: implement merge_incore_recursive()
authorElijah Newren <newren@gmail.com>
Wed, 16 Dec 2020 22:28:02 +0000 (22:28 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Dec 2020 05:56:39 +0000 (21:56 -0800)
commit8119214f4e7036cef01a8e13f161ec510b3ff710
treeaf9ef47412aaf52ae1dd84c9d13ea17cb5481a7etree
parent43e9c4eeccc069dbe6ca8a65dc5d0093b46acc03commit | diff
merge-ort: implement merge_incore_recursive()

Implement merge_incore_recursive(), mostly through the use of a new
helper function, merge_ort_internal(), which itself is based off
merge_recursive_internal() from merge-recursive.c.

This drops the number of failures in the testsuite when run under
GIT_TEST_MERGE_ALGORITHM=ort from around 1500 to 647.

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