cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 23c3b6dffa220a8d88ec16d3089199485c20b6ba..7cc34e75797b406096407ba1799a1ca54e48333c 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -464,17 +464,28 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
                git ls-files -u c >out &&
                test_line_count = 2 out &&
                git ls-files -o >out &&
-               test_line_count = 3 out &&
+               test_line_count = 1 out &&
 
                test_path_is_missing a &&
                test_path_is_missing b &&
-               test_path_is_file c~HEAD &&
-               test_path_is_file c~C^0 &&
 
-               git rev-parse >expect   \
-                       C:a     B:b     &&
-               git hash-object >actual \
-                       c~HEAD  c~C^0   &&
+               git rev-parse >expect  \
+                       C:a     B:b    &&
+               git rev-parse >actual  \
+                       :2:c    :3:c   &&
+               test_cmp expect actual &&
+
+               # Test that the two-way merge in new_a is as expected
+               git cat-file -p :2:c >>ours &&
+               git cat-file -p :3:c >>theirs &&
+               >empty &&
+               test_must_fail git merge-file \
+                       -L "HEAD" \
+                       -L "" \
+                       -L "C^0" \
+                       ours empty theirs &&
+               git hash-object c >actual &&
+               git hash-object ours >expect &&
                test_cmp expect actual
        )
 '
@@ -673,7 +684,7 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
                git ls-files -u c >out &&
                test_line_count = 2 out &&
                git ls-files -o >out &&
-               test_line_count = 5 out &&
+               test_line_count = 1 out &&
 
                git rev-parse >expect               \
                        A:a   C:b   B:b   C:c   B:c &&
@@ -681,14 +692,27 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
                        :1:a  :2:b  :3:b  :2:c  :3:c &&
                test_cmp expect actual &&
 
-               git rev-parse >expect               \
-                       C:c     B:c     C:b     B:b &&
-               git hash-object >actual                \
-                       c~HEAD  c~B\^0  b~HEAD  b~B\^0 &&
-               test_cmp expect actual &&
+               # Record some contents for re-doing merges
+               git cat-file -p A:a >stuff &&
+               git cat-file -p C:b >important_info &&
+               git cat-file -p B:c >precious_data &&
+               >empty &&
 
-               test_path_is_missing b &&
-               test_path_is_missing c
+               # Test the merge in b
+               test_must_fail git merge-file \
+                       -L "HEAD" \
+                       -L "" \
+                       -L "B^0" \
+                       important_info empty stuff &&
+               test_cmp important_info b &&
+
+               # Test the merge in c
+               test_must_fail git merge-file \
+                       -L "HEAD" \
+                       -L "" \
+                       -L "B^0" \
+                       stuff empty precious_data &&
+               test_cmp stuff c
        )
 '
 
@@ -940,7 +964,6 @@ test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename
 test_conflicts_with_adds_and_renames() {
        sideL=$1
        sideR=$2
-       expect=$3
 
        # Setup:
        #          L
@@ -1048,7 +1071,7 @@ test_conflicts_with_adds_and_renames() {
                )
        '
 
-       test_expect_$expect "check simple $sideL/$sideR conflict" '
+       test_expect_success "check simple $sideL/$sideR conflict" '
                (
                        cd simple_${sideL}_${sideR} &&
 
@@ -1094,10 +1117,10 @@ test_conflicts_with_adds_and_renames() {
        '
 }
 
-test_conflicts_with_adds_and_renames rename rename failure
-test_conflicts_with_adds_and_renames rename add    failure
-test_conflicts_with_adds_and_renames add    rename failure
-test_conflicts_with_adds_and_renames add    add    success
+test_conflicts_with_adds_and_renames rename rename
+test_conflicts_with_adds_and_renames rename add
+test_conflicts_with_adds_and_renames add    rename
+test_conflicts_with_adds_and_renames add    add
 
 # Setup:
 #          L
@@ -1168,7 +1191,7 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
        )
 '
 
-test_expect_failure 'check nested conflicts from rename/rename(2to1)' '
+test_expect_success 'check nested conflicts from rename/rename(2to1)' '
        (
                cd nested_conflicts_from_rename_rename &&