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")"
|
SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
|
||||||
case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
|
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"
|
git stripspace > "$dotest/msg-clean"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
Reference in New Issue
Block a user