Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  am: POSIX portability fix

diff --git a/git-am.sh b/git-am.sh
index 646dc45b8dbf74f1af356b038c6d0d21bb59df3d..a391254a709410cbf456296168f029c82bad303a 100755 (executable)
--- 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