am: POSIX portability fix
POSIX allows echo without flag to interpret specials such as \n, and we tried to make things portable by using printf instead where it matters. Recently added code to "git am" had unprotected "echo", which was caught by t4014 and Rémi Vanicat. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
11dc4e70c3
commit
29df2385d0
@ -302,7 +302,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