diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:35:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:35:07 -0800 |
| commit | 5e2f779cbf60997809130fde213736e1ea4f6f33 (patch) | |
| tree | 5d813dedae9d98c249538e9327c28b950d7fe163 | |
| parent | Merge branch 'bw/diff-color-hunk-header' (diff) | |
| parent | Remove dead code from "git am" (diff) | |
| download | tgif-5e2f779cbf60997809130fde213736e1ea4f6f33.tar.xz | |
Merge branch 'jc/maint-am-keep'
| -rwxr-xr-x | git-am.sh | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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 |