summaryrefslogtreecommitdiffstats
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-19 04:34:31 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-19 04:34:31 +0100
commit4d2e283a1ecda43de9b5cafea27b68a08dfd5767 (patch)
treec68874e0ec3a9775fd14b21e9b83f3bb692cbb4f /git-am.sh
parentgit-am: Make it easier to see which patch failed (diff)
downloadgit-4d2e283a1ecda43de9b5cafea27b68a08dfd5767.tar.xz
git-4d2e283a1ecda43de9b5cafea27b68a08dfd5767.zip
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index ae2fe5651c..cf3d4a7415 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