Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index f1106e65422823288f25add874d366afa5ea99f1..6e594bf1e211e246cdc02ab22d7be4a9da91d5d2 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 "\\0" $i >$i &&
+            dd if=/dev/zero bs=4k count=1 | tr "\\000" $i >$i &&
             git update-index --add $i || return 1
      done &&
      cat c >d && echo foo >>d && git update-index --add d &&