diff options
| author | Victoria Dye <vdye@github.com> | 2022-03-01 20:24:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-01 20:36:01 (GMT) |
| commit | f27c170f645e6b8ed642c49c503964893ee26a4f (patch) | |
| tree | c0d312c61552349d77fba491c80761fa324a5b69 /t | |
| parent | ab81047a6c5c4f98640f8a2f56e138367cfdada9 (diff) | |
| download | git-f27c170f645e6b8ed642c49c503964893ee26a4f.zip git-f27c170f645e6b8ed642c49c503964893ee26a4f.tar.gz git-f27c170f645e6b8ed642c49c503964893ee26a4f.tar.bz2 | |
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 <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 61dc2ea..8be8e3c 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -1413,7 +1413,9 @@ test_expect_success 'sparse index is not expanded: read-tree' ' init_repos && ensure_not_expanded checkout -b test-branch update-folder1 && - for MERGE_TREES in "base update-folder2" \ + for MERGE_TREES in "base HEAD update-folder2" \ + "base HEAD rename-base" \ + "base update-folder2" \ "base rename-base" \ "update-folder2" do |