diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:50 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-20 12:35:40 -0700 |
| commit | 66b209b86ad3b79728d3f0f22e1bdef6b17a12c1 (patch) | |
| tree | 64a00b23586ed5a9957be46541dcc966a5175fbf /t | |
| parent | t6428: new test for SKIP_WORKTREE handling and conflicts (diff) | |
| download | tgif-66b209b86ad3b79728d3f0f22e1bdef6b17a12c1.tar.xz | |
merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
When merge conflicts occur in paths removed by a sparse-checkout, we
need to unsparsify those paths (clear the SKIP_WORKTREE bit), and write
out the conflicted file to the working copy. In the very unlikely case
that someone manually put a file into the working copy at the location
of the SKIP_WORKTREE file, we need to avoid overwriting whatever edits
they have made and move that file to a different location first.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6428-merge-conflicts-sparse.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh index 1bb52ff6f3..7e8bf497f8 100755 --- a/t/t6428-merge-conflicts-sparse.sh +++ b/t/t6428-merge-conflicts-sparse.sh @@ -76,7 +76,7 @@ test_setup_numerals () { ) } -test_expect_merge_algorithm success failure 'conflicting entries written to worktree even if sparse' ' +test_expect_success 'conflicting entries written to worktree even if sparse' ' test_setup_numerals plain && ( cd numerals_plain && @@ -112,7 +112,7 @@ test_expect_merge_algorithm success failure 'conflicting entries written to work ) ' -test_expect_merge_algorithm failure failure 'present-despite-SKIP_WORKTREE handled reasonably' ' +test_expect_merge_algorithm failure success 'present-despite-SKIP_WORKTREE handled reasonably' ' test_setup_numerals in_the_way && ( cd numerals_in_the_way && |