t6042: Add tests for content issues with modify/rename/directory conflicts

Add testcases that cover a variety of merge issues with files being
renamed and modified on different sides of history, when there are
directories possibly conflicting with the rename location.

Case 1:
On one side of history, a file is modified and a new directory is added.
On the other side of history, the file is modified in a non-conflicting
way but is renamed to the location of the new directory.

Case 2:
[Same as case 1, but there is also a content conflict.  In detail:]
On one side of history, a file is modified and a new directory is added.
On the other side of history, the file is modified in a conflicting way
and it is renamed to the location of the new directory.

Case 3:
[Similar to case 1, but the "conflicting" directory is the directory
where the file original resided.  In detail:]
On one side of history, a file is modified.  On the other side of history,
the file is modified in a non-conflicting way, but the directory it was
under is removed and the file is renamed to the location of the directory
it used to reside in (i.e. 'sub/file' gets renamed to 'sub').  This is
flagged as a directory/rename conflict, but should be able to be resolved
since the directory can be cleanly removed by the merge.

One branch renames a file and makes a file where the directory the renamed
file used to be in, and the other branch updates the file in
place. Merging them should resolve it cleanly as long as the content level
change on the branches do not overlap and rename is detected, or should
leave conflict without losing information.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index db5560ca1b795b67bc30f53ba98a91f70e38e357..b4656674456619b074532af531a4a66b5cc69cb0 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -198,4 +198,145 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other
        test $(git rev-parse HEAD:a) = $(git rev-parse C:a)
 '
 
+test_expect_success 'setup content merge + rename/directory conflict' '
+       git rm -rf . &&
+       git clean -fdqx &&
+       rm -rf .git &&
+       git init &&
+
+       printf "1\n2\n3\n4\n5\n6\n" >file &&
+       git add file &&
+       test_tick &&
+       git commit -m base &&
+       git tag base &&
+
+       git checkout -b right &&
+       echo 7 >>file &&
+       mkdir newfile &&
+       echo junk >newfile/realfile &&
+       git add file newfile/realfile &&
+       test_tick &&
+       git commit -m right &&
+
+       git checkout -b left-conflict base &&
+       echo 8 >>file &&
+       git add file &&
+       git mv file newfile &&
+       test_tick &&
+       git commit -m left &&
+
+       git checkout -b left-clean base &&
+       echo 0 >newfile &&
+       cat file >>newfile &&
+       git add newfile &&
+       git rm file &&
+       test_tick &&
+       git commit -m left
+'
+
+test_expect_failure 'rename/directory conflict + clean content merge' '
+       git reset --hard &&
+       git reset --hard &&
+       git clean -fdqx &&
+
+       git checkout left-clean^0 &&
+
+       test_must_fail git merge -s recursive right^0 &&
+
+       test 2 -eq $(git ls-files -s | wc -l) &&
+       test 1 -eq $(git ls-files -u | wc -l) &&
+       test 1 -eq $(git ls-files -o | wc -l) &&
+
+       echo 0 >expect &&
+       git cat-file -p base:file >>expect &&
+       echo 7 >>expect &&
+       test_cmp expect newfile~HEAD &&
+
+       test $(git rev-parse :2:newfile) = $(git hash-object expect) &&
+
+       test -f newfile/realfile &&
+       test -f newfile~HEAD
+'
+
+test_expect_failure 'rename/directory conflict + content merge conflict' '
+       git reset --hard &&
+       git reset --hard &&
+       git clean -fdqx &&
+
+       git checkout left-conflict^0 &&
+
+       test_must_fail git merge -s recursive right^0 &&
+
+       test 4 -eq $(git ls-files -s | wc -l) &&
+       test 3 -eq $(git ls-files -u | wc -l) &&
+       test 1 -eq $(git ls-files -o | wc -l) &&
+
+       git cat-file -p left-conflict:newfile >left &&
+       git cat-file -p base:file    >base &&
+       git cat-file -p right:file   >right &&
+       test_must_fail git merge-file \
+               -L "HEAD:newfile" \
+               -L "" \
+               -L "right^0:file" \
+               left base right &&
+       test_cmp left newfile~HEAD &&
+
+       test $(git rev-parse :1:newfile) = $(git rev-parse base:file) &&
+       test $(git rev-parse :2:newfile) = $(git rev-parse left-conflict:newfile) &&
+       test $(git rev-parse :3:newfile) = $(git rev-parse right:file) &&
+
+       test -f newfile/realfile &&
+       test -f newfile~HEAD
+'
+
+test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '
+       git reset --hard &&
+       git rm -rf . &&
+       git clean -fdqx &&
+       rm -rf .git &&
+       git init &&
+
+       mkdir sub &&
+       printf "1\n2\n3\n4\n5\n6\n" >sub/file &&
+       git add sub/file &&
+       test_tick &&
+       git commit -m base &&
+       git tag base &&
+
+       git checkout -b right &&
+       echo 7 >>sub/file &&
+       git add sub/file &&
+       test_tick &&
+       git commit -m right &&
+
+       git checkout -b left base &&
+       echo 0 >newfile &&
+       cat sub/file >>newfile &&
+       git rm sub/file &&
+       mv newfile sub &&
+       git add sub &&
+       test_tick &&
+       git commit -m left
+'
+
+test_expect_success 'disappearing dir in rename/directory conflict handled' '
+       git reset --hard &&
+       git clean -fdqx &&
+
+       git checkout left^0 &&
+
+       git merge -s recursive right^0 &&
+
+       test 1 -eq $(git ls-files -s | wc -l) &&
+       test 0 -eq $(git ls-files -u | wc -l) &&
+       test 0 -eq $(git ls-files -o | wc -l) &&
+
+       echo 0 >expect &&
+       git cat-file -p base:sub/file >>expect &&
+       echo 7 >>expect &&
+       test_cmp expect sub &&
+
+       test -f sub
+'
+
 test_done