diff options
author | Elijah Newren <newren@gmail.com> | 2020-12-13 08:04:18 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:18:20 -0800 |
commit | 6a02dd90c99c59eada5e5b80e7140e56c1d4a2b0 (patch) | |
tree | 4c609de6d124fcd212b3be365f5e0ba1987e0255 /commit.h | |
parent | 291f29caf6b045576f9953f0ea41fc8367966750 (diff) |
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>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions