diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-19 07:07:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-19 07:07:00 +0200 |
| commit | 4c414e2e09607d53141573710ef6d79db2aa64ae (patch) | |
| tree | 991b179270a9c611c97c8d7e3d85fda677696fdc | |
| parent | git-remote: reject adding remotes with invalid names (diff) | |
| parent | am: POSIX portability fix (diff) | |
| download | git-4c414e2e09607d53141573710ef6d79db2aa64ae.tar.xz git-4c414e2e09607d53141573710ef6d79db2aa64ae.zip | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
am: POSIX portability fix
| -rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |