Merge branch 'jc/maint-am-keep' into maint

* jc/maint-am-keep:
  Remove dead code from "git am"

1 files changed, 6 insertions, 5 deletions

diff --git a/git-am.sh b/git-am.sh
index 185ea23af6..f48620d5bc 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