Merge branch 'js/fast-export-paths-with-spaces'

diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 08ad6d8b9e6b2869bfd2b574779380895709972d..99627bc6d69f17a8dce0ad318764e32cd9d9f507 100755 (executable)
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -25,10 +25,10 @@ test_expect_success 'setup' "
        git commit -m 'Initial Version' 2>/dev/null &&
 
        git checkout -b binary &&
-       perl -pe 'y/x/\000/' <file1 >file3 &&
+       "$PERL_PATH" -pe 'y/x/\000/' <file1 >file3 &&
        cat file3 >file4 &&
        git add file2 &&
-       perl -pe 'y/\000/v/' <file3 >file1 &&
+       "$PERL_PATH" -pe 'y/\000/v/' <file3 >file1 &&
        rm -f file2 &&
        git update-index --add --remove file1 file2 file3 file4 &&
        git commit -m 'Second Version' &&
@@ -50,11 +50,11 @@ test_expect_success 'setup' "
 "
 
 test_expect_success 'stat binary diff -- should not fail.' \
-       'git checkout master
+       'git checkout master &&
         git apply --stat --summary B.diff'
 
 test_expect_success 'stat binary diff (copy) -- should not fail.' \
-       'git checkout master
+       'git checkout master &&
         git apply --stat --summary C.diff'
 
 test_expect_success 'check binary diff -- should fail.' \
@@ -78,11 +78,11 @@ test_expect_success \
 '
 
 test_expect_success 'check binary diff with replacement.' \
-       'git checkout master
+       'git checkout master &&
         git apply --check --allow-binary-replacement BF.diff'
 
 test_expect_success 'check binary diff with replacement (copy).' \
-       'git checkout master
+       'git checkout master &&
         git apply --check --allow-binary-replacement CF.diff'
 
 # Now we start applying them.