From 2aad957a519b354e248da8c76ee0d3997083dde6 Mon Sep 17 00:00:00 2001 From: Jason Riedy Date: Mon, 15 Jan 2007 17:31:29 -0800 Subject: Replace "echo -n" with printf in shell scripts. Not all echos know -n. This was causing a test failure in t5401-update-hooks.sh, but not t3800-mktag.sh for some reason. Signed-off-by: Jason Riedy Signed-off-by: Junio C Hamano --- t/t3800-mktag.sh | 2 +- t/t5401-update-hooks.sh | 4 ++-- t/t6023-merge-file.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 5b23b7769d..ede4d42495 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -88,7 +88,7 @@ check_verify_failure '"type" line label check' # 5. type line eol check echo "object 779e9b33986b1c2670fff52c5067603117b3e895" >tag.sig -echo -n "type tagsssssssssssssssssssssssssssssss" >>tag.sig +printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig cat >expect.pat <victim/.git/hooks/update <<'EOF' #!/bin/sh echo "$@" >$GIT_DIR/update.args -read x; echo -n "$x" >$GIT_DIR/update.stdin +read x; printf "$x" >$GIT_DIR/update.stdin echo STDOUT update echo STDERR update >&2 EOF @@ -32,7 +32,7 @@ chmod u+x victim/.git/hooks/update cat >victim/.git/hooks/post-update <<'EOF' #!/bin/sh echo "$@" >$GIT_DIR/post-update.args -read x; echo -n "$x" >$GIT_DIR/post-update.stdin +read x; printf "$x" >$GIT_DIR/post-update.stdin echo STDOUT post-update echo STDERR post-update >&2 EOF diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index 1c21d8c986..f3cd3dba4d 100644 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -52,7 +52,7 @@ super aquam refectionis educavit me; animam meam convertit, deduxit me super semitas jusitiae, EOF -echo -n "propter nomen suum." >> new4.txt +printf "propter nomen suum." >> new4.txt cp new1.txt test.txt test_expect_success "merge without conflict" \ -- cgit v1.2.1