index f1e650ac39c59dfed692a8c373ed9ffef83f45f6..9811d467da5a54eefd68ecfad4c68b67e5b3734f 100755 (executable)
--- a/t/t1012-read-tree-df.sh
+++ b/t/t1012-read-tree-df.sh
:
'
:
'
-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
settree A-000 &&
git read-tree -m -u O-000 A-000 B-000 &&
checkindex <<-EOF
EOF
'
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
settree A-001 &&
git read-tree -m -u O-000 A-001 B-000 &&
checkindex <<-EOF
EOF
'
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
settree A-010 &&
git read-tree -m -u O-010 A-010 B-010 &&
checkindex <<-EOF
EOF
'
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
settree O-020 &&
git read-tree -m -u O-020 A-020 &&
checkindex <<-EOF