aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-18 19:34:31 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-18 19:34:31 -0800
commit4d2e283a1ecda43de9b5cafea27b68a08dfd5767 (patch)
treec68874e0ec3a9775fd14b21e9b83f3bb692cbb4f
parenta70d4100d027503f441d696cb2bc60c65349d2e9 (diff)
downloadgit-4d2e283a1ecda43de9b5cafea27b68a08dfd5767.tar.gz
git-4d2e283a1ecda43de9b5cafea27b68a08dfd5767.tar.xz
git-am: re-fix the diag message printing
The $FIRSTLINE variable is from the user's commit and can contain arbitrary backslash escapes that may be (mis)interpreted when given to "echo", depending on the implementation. Use "printf" to work around the issue. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index ae2fe5651..cf3d4a741 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -501,7 +501,7 @@ do
fi
if test $apply_status != 0
then
- echo "Patch failed at $msgnum $FIRSTLINE"
+ printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
stop_here_user_resolve $this
fi