Merge git://git.bogomips.org/git-svn

diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index b00196bd238f538f78ce421979e725ce501e84e1..3e821f958bf10afc739e014ed854254a625affd9 100755 (executable)
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -424,13 +424,13 @@ test_expect_success 'fast-export quotes pathnames' '
                --cacheinfo 100644 $blob "path with \\backslash" \
                --cacheinfo 100644 $blob "path with space" &&
         git commit -m addition &&
-        git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
+        git ls-files -z -s | "$PERL_PATH" -0pe "s{\\t}{$&subdir/}" >index &&
         git read-tree --empty &&
         git update-index -z --index-info <index &&
         git commit -m rename &&
         git read-tree --empty &&
         git commit -m deletion &&
-        git fast-export HEAD >export.out &&
+        git fast-export -M HEAD >export.out &&
         git rev-list HEAD >expect &&
         git init result &&
         cd result &&