Merge branch 'maint-1.5.4' into maint

* maint-1.5.4: am: POSIX portability fix
git-mirror · Apr 19, 2008 · 4c414e2 · 4c414e2
2 parents 24b6177 + 29df238
commit 4c414e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-am.sh b/git-am.sh
@@ -330,7 +330,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