Merge branch 'py/diff-submodule'

diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index dc8c36931098b85d802284d33dfc8f8ebaa5e6f5..24a00a9df13b0781700f24e6a8e75505696a11dd 100755 (executable)
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -54,7 +54,7 @@ echo 'just space
 no-funny
 tabs   ," (dq) and spaces' >expected
 test_expect_success 'git ls-files -z with-funny' \
-       'git ls-files -z | tr \\0 \\012 >current &&
+       'git ls-files -z | perl -pe y/\\000/\\012/ >current &&
        git diff expected current'
 
 t1=`git write-tree`
@@ -83,11 +83,11 @@ test_expect_success 'git diff-tree with-funny' \
 echo 'A
 tabs   ," (dq) and spaces' >expected
 test_expect_success 'git diff-index -z with-funny' \
-       'git diff-index -z --name-status $t0 | tr \\0 \\012 >current &&
+       'git diff-index -z --name-status $t0 | perl -pe y/\\000/\\012/ >current &&
        git diff expected current'
 
 test_expect_success 'git diff-tree -z with-funny' \
-       'git diff-tree -z --name-status $t0 $t1 | tr \\0 \\012 >current &&
+       'git diff-tree -z --name-status $t0 $t1 | perl -pe y/\\000/\\012/ >current &&
        git diff expected current'
 
 cat > expected <<\EOF