Merge branch 'maint'

diff --git a/t/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh
index 9811d467da5a54eefd68ecfad4c68b67e5b3734f..a6a04b6b90d290a445ed7c33e5928a9a168ed28b 100755 (executable)
--- a/t/t1012-read-tree-df.sh
+++ b/t/t1012-read-tree-df.sh
@@ -3,6 +3,7 @@
 test_description='read-tree D/F conflict corner cases'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-read-tree.sh
 
 maketree () {
        (
@@ -53,7 +54,7 @@ test_expect_success setup '
 
 test_expect_success '3-way (1)' '
        settree A-000 &&
-       git read-tree -m -u O-000 A-000 B-000 &&
+       read_tree_u_must_succeed -m -u O-000 A-000 B-000 &&
        checkindex <<-EOF
        3 a/b
        0 a/b-2/c/d
@@ -65,7 +66,7 @@ test_expect_success '3-way (1)' '
 
 test_expect_success '3-way (2)' '
        settree A-001 &&
-       git read-tree -m -u O-000 A-001 B-000 &&
+       read_tree_u_must_succeed -m -u O-000 A-001 B-000 &&
        checkindex <<-EOF
        3 a/b
        0 a/b-2/c/d
@@ -78,7 +79,7 @@ test_expect_success '3-way (2)' '
 
 test_expect_success '3-way (3)' '
        settree A-010 &&
-       git read-tree -m -u O-010 A-010 B-010 &&
+       read_tree_u_must_succeed -m -u O-010 A-010 B-010 &&
        checkindex <<-EOF
        2 t
        1 t-0
@@ -92,7 +93,7 @@ test_expect_success '3-way (3)' '
 
 test_expect_success '2-way (1)' '
        settree O-020 &&
-       git read-tree -m -u O-020 A-020 &&
+       read_tree_u_must_succeed -m -u O-020 A-020 &&
        checkindex <<-EOF
        0 ds/dma/ioat/Makefile
        0 ds/dma/ioat/registers.h