]> git.99rst.org Git - git.git/commit
read-tree: make three-way merge sparse-aware
authorVictoria Dye <redacted>
Tue, 1 Mar 2022 20:24:31 +0000 (20:24 +0000)
committerJunio C Hamano <redacted>
Tue, 1 Mar 2022 20:36:01 +0000 (12:36 -0800)
commitf27c170f645e6b8ed642c49c503964893ee26a4f
treec0d312c61552349d77fba491c80761fa324a5b69
parentab81047a6c5c4f98640f8a2f56e138367cfdada9
read-tree: make three-way merge sparse-aware

Enable use of 'merged_sparse_dir' in 'threeway_merge'. As with two-way
merge, the contents of each conflicted sparse directory are merged without
referencing the index, avoiding sparse index expansion.

As with two-way merge, the 't/t1092-sparse-checkout-compatibility.sh' test
'read-tree --merge with edit/edit conflicts in sparse directories' confirms
that three-way merges with edit/edit changes (both with and without
conflicts) inside a sparse directory result in the correct index state or
error message. To ensure the index is not unnecessarily expanded, add
three-way merge cases to 'sparse index is not expanded: read-tree'.

Signed-off-by: Victoria Dye <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/read-tree.c
t/t1092-sparse-checkout-compatibility.sh
unpack-trees.c
git clone https://git.99rst.org/PROJECT