diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-12-13 08:04:26 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:18:20 -0800 |
| commit | ef2b369387004f4f11497a55174d0d9859549054 (patch) | |
| tree | 0882bc79a8b7c8e18a2a77ca8149490e5dc0ac5f /t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh | |
| parent | tree: enable cmp_cache_name_compare() to be used elsewhere (diff) | |
| download | tgif-ef2b369387004f4f11497a55174d0d9859549054.tar.xz | |
merge-ort: add implementation of record_conflicted_index_entries()
After checkout(), the working tree has the appropriate contents, and the
index matches the working copy. That means that all unmodified and
cleanly merged files have correct index entries, but conflicted entries
need to be updated.
We do this by looping over the conflicted entries, marking the existing
index entry for the path with CE_REMOVE, adding new higher order staged
for the path at the end of the index (ignoring normal index sort order),
and then at the end of the loop removing the CE_REMOVED-marked cache
entries and sorting the index.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh')
0 files changed, 0 insertions, 0 deletions