]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: add a preliminary simple process_entries() implementation
authorElijah Newren <newren@gmail.com>
Sun, 13 Dec 2020 08:04:18 +0000 (08:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Dec 2020 22:18:20 +0000 (14:18 -0800)
commit6a02dd90c99c59eada5e5b80e7140e56c1d4a2b0
tree4c609de6d124fcd212b3be365f5e0ba1987e0255
parent291f29caf6b045576f9953f0ea41fc8367966750
merge-ort: add a preliminary simple process_entries() implementation

Add a process_entries() implementation that just loops over the paths
and processes each one individually with an auxiliary process_entry()
call.  Add a basic process_entry() as well, which handles several cases
but leaves a few of the more involved ones with die-not-implemented
messages.  Also, although process_entries() is supposed to create a
tree, it does not yet have code to do so -- except in the special case
of merging completely empty trees.

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