git on Mac OS and precomposed unicode

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 371fb39c6a51f33f0b980d4dac8dc50555c15c1d..466fa3804bc8a840d994e9d2e9092f599cc87eab 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -26,7 +26,7 @@ test_expect_success 'setup rename/delete + untracked file' '
        echo "Myyy PRECIOUSSS" >ring
 '
 
-test_expect_failure "Does git preserve Gollum's precious artifact?" '
+test_expect_success "Does git preserve Gollum's precious artifact?" '
        test_must_fail git merge -s recursive rename-the-ring &&
 
        # Make sure git did not delete an untracked file
@@ -104,7 +104,7 @@ test_expect_failure 'conflict caused if rename not detected' '
        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_line_count = 6 c &&
        test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
        test $(git rev-parse HEAD:b) = $(git rev-parse A:b)
 '
@@ -234,7 +234,7 @@ test_expect_success 'setup content merge + rename/directory conflict' '
        git commit -m left
 '
 
-test_expect_failure 'rename/directory conflict + clean content merge' '
+test_expect_success 'rename/directory conflict + clean content merge' '
        git reset --hard &&
        git reset --hard &&
        git clean -fdqx &&
@@ -258,7 +258,7 @@ test_expect_failure 'rename/directory conflict + clean content merge' '
        test -f newfile~HEAD
 '
 
-test_expect_failure 'rename/directory conflict + content merge conflict' '
+test_expect_success 'rename/directory conflict + content merge conflict' '
        git reset --hard &&
        git reset --hard &&
        git clean -fdqx &&
@@ -376,7 +376,7 @@ test_expect_success 'setup rename/rename (2to1) + modify/modify' '
        git commit -m C
 '
 
-test_expect_failure 'handle rename/rename (2to1) conflict correctly' '
+test_expect_success 'handle rename/rename (2to1) conflict correctly' '
        git checkout B^0 &&
 
        test_must_fail git merge -s recursive C^0 >out &&
@@ -441,4 +441,138 @@ test_expect_success 'merge has correct working tree contents' '
        test $(git hash-object c) = $(git rev-parse A:a)
 '
 
+# Testcase setup for rename/rename(1to2)/add-source conflict:
+#   Commit A: new file: a
+#   Commit B: rename a->b
+#   Commit C: rename a->c, add completely different a
+#
+# Merging of B & C should NOT be clean; there's a rename/rename conflict
+
+test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
+       git rm -rf . &&
+       git clean -fdqx &&
+       rm -rf .git &&
+       git init &&
+
+       printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
+       git add a &&
+       git commit -m A &&
+       git tag A &&
+
+       git checkout -b B A &&
+       git mv a b &&
+       git commit -m B &&
+
+       git checkout -b C A &&
+       git mv a c &&
+       echo something completely different >a &&
+       git add a &&
+       git commit -m C
+'
+
+test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' '
+       git checkout B^0 &&
+
+       test_must_fail git merge -s recursive C^0 &&
+
+       test 4 -eq $(git ls-files -s | wc -l) &&
+       test 0 -eq $(git ls-files -o | wc -l) &&
+
+       test $(git rev-parse 3:a) = $(git rev-parse C:a) &&
+       test $(git rev-parse 1:a) = $(git rev-parse A:a) &&
+       test $(git rev-parse 2:b) = $(git rev-parse B:b) &&
+       test $(git rev-parse 3:c) = $(git rev-parse C:c) &&
+
+       test -f a &&
+       test -f b &&
+       test -f c
+'
+
+test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
+       git rm -rf . &&
+       git clean -fdqx &&
+       rm -rf .git &&
+       git init &&
+
+       >a &&
+       git add a &&
+       test_tick &&
+       git commit -m base &&
+       git tag A &&
+
+       git checkout -b B A &&
+       git mv a b &&
+       test_tick &&
+       git commit -m one &&
+
+       git checkout -b C A &&
+       git mv a b &&
+       echo important-info >a &&
+       git add a &&
+       test_tick &&
+       git commit -m two
+'
+
+test_expect_failure 'rename/rename/add-source still tracks new a file' '
+       git checkout C^0 &&
+       git merge -s recursive B^0 &&
+
+       test 2 -eq $(git ls-files -s | wc -l) &&
+       test 0 -eq $(git ls-files -o | wc -l) &&
+
+       test $(git rev-parse HEAD:a) = $(git rev-parse C:a) &&
+       test $(git rev-parse HEAD:b) = $(git rev-parse A:a)
+'
+
+test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
+       git rm -rf . &&
+       git clean -fdqx &&
+       rm -rf .git &&
+       git init &&
+
+       echo stuff >a &&
+       git add a &&
+       test_tick &&
+       git commit -m base &&
+       git tag A &&
+
+       git checkout -b B A &&
+       git mv a b &&
+       echo precious-data >c &&
+       git add c &&
+       test_tick &&
+       git commit -m one &&
+
+       git checkout -b C A &&
+       git mv a c &&
+       echo important-info >b &&
+       git add b &&
+       test_tick &&
+       git commit -m two
+'
+
+test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
+       git checkout C^0 &&
+       test_must_fail git merge -s recursive B^0 &&
+
+       test 5 -eq $(git ls-files -s | wc -l) &&
+       test 2 -eq $(git ls-files -u b | wc -l) &&
+       test 2 -eq $(git ls-files -u c | wc -l) &&
+       test 4 -eq $(git ls-files -o | wc -l) &&
+
+       test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
+       test $(git rev-parse :2:b) = $(git rev-parse C:b) &&
+       test $(git rev-parse :3:b) = $(git rev-parse B:b) &&
+       test $(git rev-parse :2:c) = $(git rev-parse C:c) &&
+       test $(git rev-parse :3:c) = $(git rev-parse B:c) &&
+
+       test $(git hash-object c~HEAD) = $(git rev-parse C:c) &&
+       test $(git hash-object c~B\^0) = $(git rev-parse B:c) &&
+       test $(git hash-object b~HEAD) = $(git rev-parse C:b) &&
+       test $(git hash-object b~B\^0) = $(git rev-parse B:b) &&
+
+       test ! -f b &&
+       test ! -f c
+'
+
 test_done