summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-18 22:07:00 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-18 22:07:00 -0700
commit4c414e2e09607d53141573710ef6d79db2aa64ae (patch)
tree991b179270a9c611c97c8d7e3d85fda677696fdc /git-am.sh
parent24b6177e0261efba063c0b83ae0cdc5993945da9 (diff)
parent29df2385d09611219c53d07f453794d6146e73a3 (diff)
downloadgit-4c414e2e09607d53141573710ef6d79db2aa64ae.tar.gz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: am: POSIX portability fix
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 646dc45b8d..a391254a70 100755
--- 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