From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Apr 2008 23:11:40 +0000 (-0700)
Subject: am: POSIX portability fix
X-Git-Tag: v1.5.5.1~4^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=29df2385d09611219c53d07f453794d6146e73a3;p=git.git

am: POSIX portability fix

POSIX allows echo without flag to interpret specials such as \n, and we
tried to make things portable by using printf instead where it matters.
Recently added code to "git am" had unprotected "echo", which was caught
by t4014 and Rémi Vanicat.

This should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-am.sh b/git-am.sh
index 6be33d9dd..851f85eb5 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -302,7 +302,7 @@ do
 		SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
 		case "$keep_subject" in -k)  SUBJECT="[PATCH] $SUBJECT" ;; esac
 
-		(echo "$SUBJECT" ; echo ; cat "$dotest/msg") |
+		(printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
 			git stripspace > "$dotest/msg-clean"
 		;;
 	esac