diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:04 -0700 |
| commit | 9cbd46aee1d803d8d4d634b4eed19065f19198cb (patch) | |
| tree | 2450641b473fc1b1499cf4bd7a4b1c8daa1f92b7 | |
| parent | Merge branch 'rr/doc-merge-strategies' into maint (diff) | |
| parent | test-lib.sh: do not "echo" caller-supplied strings (diff) | |
| download | tgif-9cbd46aee1d803d8d4d634b4eed19065f19198cb.tar.xz | |
Merge branch 'us/printf-not-echo' into maint
* us/printf-not-echo:
test-lib.sh: do not "echo" caller-supplied strings
rebase -i: do not "echo" random user-supplied strings
| -rw-r--r-- | git-rebase--interactive.sh | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 43c19e0829..43631b4723 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -739,7 +739,7 @@ rearrange_squash () { ;; esac done - echo "$sha1 $action $prefix $rest" + printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest" # if it's a single word, try to resolve to a full sha1 and # emit a second copy. This allows us to match on both message # and on sha1 prefix diff --git a/t/test-lib.sh b/t/test-lib.sh index 1531c241c0..3c7cb1d774 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -277,7 +277,7 @@ error "Test script did not set test_description." if test "$help" = "t" then - echo "$test_description" + printf '%s\n' "$test_description" exit 0 fi @@ -328,7 +328,7 @@ test_failure_ () { test_failure=$(($test_failure + 1)) say_color error "not ok $test_count - $1" shift - echo "$@" | sed -e 's/^/# /' + printf '%s\n' "$*" | sed -e 's/^/# /' test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; } } |