X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6025-merge-symlinks.sh;h=433c4de08f0cc8d220d5368ab2ab0dffde372482;hb=39a76bdd7de18b2bb2651dcb8136563df41e84f7;hp=53892a555ce2e4a51db15066771f217a135e15e9;hpb=cd50988ae03e086ca1a8f18584153d359699ea25;p=git.git diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh index 53892a555..433c4de08 100755 --- a/t/t6025-merge-symlinks.sh +++ b/t/t6025-merge-symlinks.sh @@ -18,11 +18,11 @@ git add file && git commit -m initial && git branch b-symlink && git branch b-file && -l=$(echo -n file | git hash-object -t blob -w --stdin) && +l=$(printf file | git hash-object -t blob -w --stdin) && echo "120000 $l symlink" | git update-index --index-info && git commit -m master && git checkout b-symlink && -l=$(echo -n file-different | git hash-object -t blob -w --stdin) && +l=$(printf file-different | git hash-object -t blob -w --stdin) && echo "120000 $l symlink" | git update-index --index-info && git commit -m b-symlink && git checkout b-file &&