mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: am: POSIX portability fix
This commit is contained in:
commit
4c414e2e09
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue