Avoid using `echo -n` anywhere

`echo -n` is non-portable. The POSIX specification says:

Conforming applications that wish to do prompting without <newline>
characters or that could possibly be expecting to echo a -n, should
use the printf utility derived from the Ninth Edition system.

Since all of the affected shell scripts use a POSIX shell shebang,
replace `echo -n` invocations with printf.

Signed-off-by: Lukas Fleischer <git@cryptocrack.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 8a23f58ba04c4b1402c66d03db69d0c109c90b58..2b217675af58f7e225e8efad48e0391f8efe3f88 100755 (executable)
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -311,7 +311,7 @@ copy_commit()
                        GIT_COMMITTER_NAME \
                        GIT_COMMITTER_EMAIL \
                        GIT_COMMITTER_DATE
                        GIT_COMMITTER_NAME \
                        GIT_COMMITTER_EMAIL \
                        GIT_COMMITTER_DATE

-               (echo -n "$annotate"; cat ) |
+               (printf "%s" "$annotate"; cat ) |

                git commit-tree "$2" $3  # reads the rest of stdin
        ) || die "Can't copy commit $1"
 }
                git commit-tree "$2" $3  # reads the rest of stdin
        ) || die "Can't copy commit $1"
 }

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index b0f8536fca58d910f85334727b89925651bfa8ae..66ce4b07c2dc2d2d56dc260883f86d8672d2ac69 100755 (executable)
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -182,9 +182,9 @@ test_expect_success 'merge new subproj history into subdir' '
 test_expect_success 'Check that prefix argument is required for split' '
         echo "You must provide the --prefix option." > expected &&
         test_must_fail git subtree split > actual 2>&1 &&
 test_expect_success 'Check that prefix argument is required for split' '
         echo "You must provide the --prefix option." > expected &&
         test_must_fail git subtree split > actual 2>&1 &&

-        test_debug "echo -n expected: " &&
+       test_debug "printf '"'"'expected: '"'"'" &&

         test_debug "cat expected" &&
         test_debug "cat expected" &&

-        test_debug "echo -n actual: " &&
+       test_debug "printf '"'"'actual: '"'"'" &&

         test_debug "cat actual" &&
         test_cmp expected actual &&
         rm -f expected actual
         test_debug "cat actual" &&
         test_cmp expected actual &&
         rm -f expected actual


@@ -193,9 +193,9 @@ test_expect_success 'Check that prefix argument is required for split' '
 test_expect_success 'Check that the <prefix> exists for a split' '
         echo "'"'"'non-existent-directory'"'"'" does not exist\; use "'"'"'git subtree add'"'"'" > expected &&
         test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 &&
 test_expect_success 'Check that the <prefix> exists for a split' '
         echo "'"'"'non-existent-directory'"'"'" does not exist\; use "'"'"'git subtree add'"'"'" > expected &&
         test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 &&

-        test_debug "echo -n expected: " &&
+       test_debug "printf '"'"'expected: '"'"'" &&

         test_debug "cat expected" &&
         test_debug "cat expected" &&

-        test_debug "echo -n actual: " &&
+       test_debug "printf '"'"'actual: '"'"'" &&

         test_debug "cat actual" &&
         test_cmp expected actual
 #        rm -f expected actual
         test_debug "cat actual" &&
         test_cmp expected actual
 #        rm -f expected actual

diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index a816fbcb7618bb8cdbf1f74a4fd2295923c02ea3..eab66d7c9bb5759136184cf8d72f4e1fd82a0ade 100644 (file)
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -160,7 +160,7 @@ test_perf () {
                echo "$test_count" >>"$perf_results_dir"/$base.subtests
                echo "$1" >"$perf_results_dir"/$base.$test_count.descr
                if test -z "$verbose"; then
                echo "$test_count" >>"$perf_results_dir"/$base.subtests
                echo "$1" >"$perf_results_dir"/$base.$test_count.descr
                if test -z "$verbose"; then

-                       echo -n "perf $test_count - $1:"
+                       printf "%s" "perf $test_count - $1:"

                else
                        echo "perf $test_count - $1:"
                fi
                else
                        echo "perf $test_count - $1:"
                fi


@@ -169,7 +169,7 @@ test_perf () {
                        if test_run_perf_ "$2"
                        then
                                if test -z "$verbose"; then
                        if test_run_perf_ "$2"
                        then
                                if test -z "$verbose"; then

-                                       echo -n " $i"
+                                       printf " %s" "$i"

                                else
                                        echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:"
                                fi
                                else
                                        echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:"
                                fi