Merge branch 'bc/maint-api-doc-parked' into maint

diff --git a/t/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh
index f1e650ac39c59dfed692a8c373ed9ffef83f45f6..9811d467da5a54eefd68ecfad4c68b67e5b3734f 100755 (executable)
--- a/t/t1012-read-tree-df.sh
+++ b/t/t1012-read-tree-df.sh
@@ -51,7 +51,7 @@ test_expect_success setup '
        :
 '
 
-test_expect_failure '3-way (1)' '
+test_expect_success '3-way (1)' '
        settree A-000 &&
        git read-tree -m -u O-000 A-000 B-000 &&
        checkindex <<-EOF
@@ -63,7 +63,7 @@ test_expect_failure '3-way (1)' '
        EOF
 '
 
-test_expect_failure '3-way (2)' '
+test_expect_success '3-way (2)' '
        settree A-001 &&
        git read-tree -m -u O-000 A-001 B-000 &&
        checkindex <<-EOF
@@ -76,7 +76,7 @@ test_expect_failure '3-way (2)' '
        EOF
 '
 
-test_expect_failure '3-way (3)' '
+test_expect_success '3-way (3)' '
        settree A-010 &&
        git read-tree -m -u O-010 A-010 B-010 &&
        checkindex <<-EOF
@@ -90,7 +90,7 @@ test_expect_failure '3-way (3)' '
        EOF
 '
 
-test_expect_failure '2-way (1)' '
+test_expect_success '2-way (1)' '
        settree O-020 &&
        git read-tree -m -u O-020 A-020 &&
        checkindex <<-EOF