From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Jan 2009 03:34:31 +0000 (-0800)
Subject: git-am: re-fix the diag message printing
X-Git-Tag: v1.6.2-rc0~106^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d2e283a1ecda43de9b5cafea27b68a08dfd5767;p=git.git

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>
---

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