git p4: scrub crlf for utf16 files on windows

diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh
index f9e00285db662504b200fb25f0ed06c796346c52..4c50ed955eb18da1a60dd9d635f3c32d081cfb76 100755 (executable)
--- a/t/t1008-read-tree-overlay.sh
+++ b/t/t1008-read-tree-overlay.sh
@@ -3,6 +3,7 @@
 test_description='test multi-tree read-tree without merging'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-read-tree.sh
 
 test_expect_success setup '
        echo one >a &&
@@ -21,7 +22,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'multi-read' '
-       git read-tree initial master side &&
+       read_tree_must_succeed initial master side &&
        (echo a; echo b/c) >expect &&
        git ls-files >actual &&
        test_cmp expect actual