diff options
| author | Jason Riedy <ejr@EECS.Berkeley.EDU> | 2007-01-15 17:31:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-15 22:23:21 -0800 |
| commit | 2aad957a519b354e248da8c76ee0d3997083dde6 (patch) | |
| tree | 258b4f061def13b863c31d06e3a30114de413e1a | |
| parent | fb9522062c89da61f5ccbaa1d063e0754463176f (diff) | |
| download | git-2aad957a519b354e248da8c76ee0d3997083dde6.tar.gz | |
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 <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | contrib/remotes2config.sh | 2 | ||||
| -rwxr-xr-x | git-quiltimport.sh | 2 | ||||
| -rwxr-xr-x | git-reset.sh | 2 | ||||
| -rwxr-xr-x | t/t3800-mktag.sh | 2 | ||||
| -rwxr-xr-x | t/t5401-update-hooks.sh | 4 | ||||
| -rw-r--r-- | t/t6023-merge-file.sh | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/contrib/remotes2config.sh b/contrib/remotes2config.sh index 25901e2b3b..b996996bfb 100644 --- a/contrib/remotes2config.sh +++ b/contrib/remotes2config.sh @@ -11,7 +11,7 @@ if [ -d "$GIT_DIR"/remotes ]; then { cd "$GIT_DIR"/remotes ls | while read f; do - name=$(echo -n "$f" | tr -c "A-Za-z0-9" ".") + name=$(printf "$f" | tr -c "A-Za-z0-9" ".") sed -n \ -e "s/^URL: \(.*\)$/remote.$name.url \1 ./p" \ -e "s/^Pull: \(.*\)$/remote.$name.fetch \1 ^$ /p" \ diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 10135da3ac..2ae1f20c2e 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -89,7 +89,7 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do echo "No author found in $patch_name" >&2; echo "---" cat $tmp_msg - echo -n "Author: "; + printf "Author: "; read patch_author echo "$patch_author" diff --git a/git-reset.sh b/git-reset.sh index 91c7e6e664..bf2a0581fe 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -87,7 +87,7 @@ update_ref_status=$? case "$reset_type" in --hard ) test $update_ref_status = 0 && { - echo -n "HEAD is now at " + printf "HEAD is now at " GIT_PAGER= git log --max-count=1 --pretty=oneline \ --abbrev-commit HEAD } 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 <<EOF ^error: char48: .*"[\]n"$ diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh index cd8cee6ae8..0514056ca6 100755 --- a/t/t5401-update-hooks.sh +++ b/t/t5401-update-hooks.sh @@ -23,7 +23,7 @@ test_expect_success setup ' cat >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" \ |