oneway_merge(): only lstat() when told to update worktree

diff --git a/test-sha1.sh b/test-sha1.sh
index 01bbb5782e05ff4da9be9e0b5b308b59e5f7c7e7..0f0bc5d02f4dcbd67c6d405350e5aaeb39f44bfb 100755 (executable)
--- a/test-sha1.sh
+++ b/test-sha1.sh
@@ -10,8 +10,8 @@ do
                {
                        test -z "$pfx" || echo "$pfx"
                        dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
-                       tr '[\0]' '[g]'
-               } | ./test-sha1
+                       perl -pe 'y/\000/g/'
+               } | ./test-sha1 $cnt
        `
        if test "$expect" = "$actual"
        then
@@ -55,7 +55,7 @@ do
                {
                        test -z "$pfx" || echo "$pfx"
                        dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
-                       tr '[\0]' '[g]'
+                       perl -pe 'y/\000/g/'
                } | sha1sum |
                sed -e 's/ .*//'
        `