summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-30 22:35:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-30 22:35:07 (GMT)
commit5e2f779cbf60997809130fde213736e1ea4f6f33 (patch)
tree5d813dedae9d98c249538e9327c28b950d7fe163 /git-am.sh
parentb918eb6c2a949282a223bdb04ec8a524003f8c0c (diff)
parentc970a6fd0142da3740f0205f16f91d3f2ed7e258 (diff)
downloadgit-5e2f779cbf60997809130fde213736e1ea4f6f33.zip
git-5e2f779cbf60997809130fde213736e1ea4f6f33.tar.gz
git-5e2f779cbf60997809130fde213736e1ea4f6f33.tar.bz2
Merge branch 'jc/maint-am-keep'
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/git-am.sh b/git-am.sh
index 512891d..4838cdb 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