summaryrefslogtreecommitdiff
path: root/t/t6025-merge-symlinks.sh
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2008-10-31 01:09:13 -0400
committerJunio C Hamano <gitster@pobox.com>2008-10-31 21:38:48 -0700
commit6ecfd91df5ec462aeded967c9ad21912c249f96e (patch)
treefaa7135734d9905f6cb430abe9561b5f771c0250 /t/t6025-merge-symlinks.sh
parentdf5e91fc2c95e051744ec9b9de66869d2b323037 (diff)
downloadgit-6ecfd91df5ec462aeded967c9ad21912c249f96e.tar.gz
Avoid using non-portable `echo -n` in tests.
Expecting echo to recognise -n is a BSDism. Using printf is far more portable. Discovered on OS X 10.5.5 in t4030-diff-textconv.sh and changed in all the test scripts. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6025-merge-symlinks.sh')
-rwxr-xr-xt/t6025-merge-symlinks.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
index 53892a555c..433c4de08f 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 &&