approxidate_careful() reports errorneous date string

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index 185ea23af63223f5b20fce983d2b7086c87c0957..f48620d5bc1dfba2012b3a7c06477f97ddef9282 100755 (executable)
--- 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