From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Feb 2010 02:13:32 +0000 (-0800)
Subject: post-applypatch: allow folded Message-ID line
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76adaf5aecfca68711fc7615e7a8656de03ee835;p=thirdparty%2Fgit.git

post-applypatch: allow folded Message-ID line
---

diff --git a/post-applypatch b/post-applypatch
index a546636098..010081e0ed 100755
--- a/post-applypatch
+++ b/post-applypatch
@@ -7,12 +7,32 @@ prec=4 &&
 this=$(cat 2>/dev/null "$dotest/next") &&
 msgnum=$(printf "%0${prec}d" $this) &&
 test -f "$dotest/$msgnum" &&
-message_id=$(sed -n '
-	/^Message-I[Dd]:[ 	]*\(<.*>\)[ 	]*$/{
-		s//\1/p
+message_id=$(sed -ne '
+	/^[ 	]/{
+		# Append continuation line
+		H
+		x
+		s/\n//
+		x
+		n
+	}
+	# Hold this new line, and look at what is in the hold space
+	x
+	# Is it the Message-ID line?  If so, spit out and finish.
+	/^[Mm][Ee][Ss][Ss][Aa][Gg][Ee]-[Ii][Dd]:[ 	]*/{
+		s///p
 		q
 	}
-	/^$/q
+	# Otherwise, check if this new line is empty
+	x
+	# Is it?  Then we are done with the header
+	/^$/b end
+	# Otherwise we need to hold onto this header line
+	x
+	# And start the next cycle
+	b
+: end
+	q
 ' "$dotest/$msgnum") &&
 
 test -n "$message_id" &&