path: root/t
diff options
authorVictoria Dye <>2022-03-01 20:24:31 (GMT)
committerJunio C Hamano <>2022-03-01 20:36:01 (GMT)
commitf27c170f645e6b8ed642c49c503964893ee26a4f (patch)
treec0d312c61552349d77fba491c80761fa324a5b69 /t
parentab81047a6c5c4f98640f8a2f56e138367cfdada9 (diff)
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/' 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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't')
1 files changed, 3 insertions, 1 deletions
diff --git a/t/ b/t/
index 61dc2ea..8be8e3c 100755
--- a/t/
+++ b/t/
@@ -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" \