diff options
| author | Victoria Dye <vdye@github.com> | 2022-03-01 20:24:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-01 12:36:01 -0800 |
| commit | f27c170f645e6b8ed642c49c503964893ee26a4f (patch) | |
| tree | c0d312c61552349d77fba491c80761fa324a5b69 /builtin/read-tree.c | |
| parent | ab81047a6c5c4f98640f8a2f56e138367cfdada9 (diff) | |
| download | git-f27c170f645e6b8ed642c49c503964893ee26a4f.tar.gz | |
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 'builtin/read-tree.c')
| -rw-r--r-- | builtin/read-tree.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 9227f07ab1..9f1f33e954 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -234,11 +234,6 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) break; case 3: default: - /* - * TODO: update threeway_merge to handle edit/edit conflicts in - * sparse directories. - */ - ensure_full_index(&the_index); opts.fn = threeway_merge; break; } |