diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-25 11:08:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 11:08:27 -0700 |
| commit | cf30bfb8fb9e749637a73685a8de9600ab1fbe5f (patch) | |
| tree | 36f8b3b615071dba63d558ddd9020cedaa825e76 | |
| parent | Merge branch 'rr/doc-merge-strategies' (diff) | |
| parent | test-lib.sh: do not "echo" caller-supplied strings (diff) | |
| download | tgif-cf30bfb8fb9e749637a73685a8de9600ab1fbe5f.tar.xz | |
Merge branch 'us/printf-not-echo'
* 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 a1adae8313..1c41cbd66c 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -749,7 +749,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 569b52dc0f..87f327ff8b 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -283,7 +283,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 @@ -334,7 +334,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; } } |