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 ae2fe5651c50efc8613c6754c61efa9500e56fbd..cf3d4a7415903a8cba99812ec4a264846165b1c2 100755 (executable)
--- 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