Merge branch 'maint-1.5.4' into maint

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index cd3c149800395553cc973317ef41e89e53771f60..c955fe44f5b962ef305e49c21bc3fb0e5b58d462 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -15,7 +15,7 @@ test_expect_success \
     'rm -f .git/index*
      for i in a b c
      do
-            dd if=/dev/zero bs=4k count=1 | tr "\\000" $i >$i &&
+            dd if=/dev/zero bs=4k count=1 | perl -pe "y/\\000/$i/" >$i &&
             git update-index --add $i || return 1
      done &&
      cat c >d && echo foo >>d && git update-index --add d &&