Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint

[git.git] / t / t1020-subdirectory.sh

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index ddc3921ac6a009dfc706cd19ad94f2b29af4b1cc..f6a44c9ee07329c8909662d2a807acf0dd6a8e43 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -7,6 +7,7 @@ test_description='Try various core-level commands in subdirectory.
 '
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-read-tree.sh
 
 test_expect_success setup '
        long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
@@ -98,13 +99,13 @@ test_expect_success 'checkout-index' '
 test_expect_success 'read-tree' '
        rm -f one dir/two &&
        tree=`git write-tree` &&
-       git read-tree --reset -u "$tree" &&
+       read_tree_u_must_succeed --reset -u "$tree" &&
        cmp one original.one &&
        cmp dir/two original.two &&
        (
                cd dir &&
                rm -f two &&
-               git read-tree --reset -u "$tree" &&
+               read_tree_u_must_succeed --reset -u "$tree" &&
                cmp two ../original.two &&
                cmp ../one ../original.one
        )