Skip to content

Commit

Permalink
Merge branch 'us/printf-not-echo' into maint
Browse files Browse the repository at this point in the history
* us/printf-not-echo:
  test-lib.sh: do not "echo" caller-supplied strings
  rebase -i: do not "echo" random user-supplied strings
  • Loading branch information
Junio C Hamano committed Apr 3, 2014
2 parents 3824595 + cb1aefd commit 9cbd46a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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; }
}

Expand Down

0 comments on commit 9cbd46a

Please sign in to comment.