t6042: Add a pair of cases where undetected renames cause issues

An undetected rename can cause a silent success where a conflict should
have been detected, or can cause an erroneous conflict state where the
merge should have been resolvable.  Add testcases for both.

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 276d7dd2d7494e51a34f7e189aba3d3dc12492e5..f338fb4055c85145a32e230d2f07ff21228dbff3 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -72,4 +72,65 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' '
        test $(git rev-parse C:a) = $(git rev-parse a)
 '
 
+test_expect_success 'setup resolvable conflict missed if rename missed' '
+       git rm -rf . &&
+       git clean -fdqx &&
+       rm -rf .git &&
+       git init &&
+
+       printf "1\n2\n3\n4\n5\n" >a &&
+       echo foo >b &&
+       git add a b &&
+       git commit -m A &&
+       git tag A &&
+
+       git checkout -b B A &&
+       git mv a c &&
+       echo "Completely different content" >a &&
+       git add a &&
+       git commit -m B &&
+
+       git checkout -b C A &&
+       echo 6 >>a &&
+       git add a &&
+       git commit -m C
+'
+
+test_expect_failure 'conflict caused if rename not detected' '
+       git checkout -q C^0 &&
+       git merge -s recursive B^0 &&
+
+       test 3 -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) &&
+
+       test 6 -eq $(wc -l < c) &&
+       test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
+       test $(git rev-parse HEAD:b) = $(git rev-parse A:b)
+'
+
+test_expect_success 'setup conflict resolved wrong if rename missed' '
+       git reset --hard &&
+       git clean -f &&
+
+       git checkout -b D A &&
+       echo 7 >>a &&
+       git add a &&
+       git mv a c &&
+       echo "Completely different content" >a &&
+       git add a &&
+       git commit -m D &&
+
+       git checkout -b E A &&
+       git rm a &&
+       echo "Completely different content" >>a &&
+       git add a &&
+       git commit -m E
+'
+
+test_expect_failure 'missed conflict if rename not detected' '
+       git checkout -q E^0 &&
+       test_must_fail git merge -s recursive D^0
+'
+
 test_done