X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-am.sh;h=4838cdb9ede8765b37ab663aa59fb1b011a30b4c;hb=b7380fa7a9adb52860eef7e8885fb8bc179beae1;hp=512891d217fc34ed5ff9992ed0b3dc7ff23f0bb0;hpb=41d5b7e362c33dc54cbc814e50403a2084204f9f;p=git.git diff --git a/git-am.sh b/git-am.sh index 512891d21..4838cdb9e 100755 --- a/git-am.sh +++ b/git-am.sh @@ -577,11 +577,12 @@ do git cat-file commit "$commit" | sed -e '1,/^$/d' >"$dotest/msg-clean" else - SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" - case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac - - (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") | - git stripspace > "$dotest/msg-clean" + { + sed -n '/^Subject/ s/Subject: //p' "$dotest/info" + echo + cat "$dotest/msg" + } | + git stripspace > "$dotest/msg-clean" fi ;; esac