Commit 2cc8d353d7ecb broke manually written patch descriptions of the
form:
> Frobnozzle: this is a patch subject
>
> From: Fred McNurk <f...@mcnurt.foo>
>
> This is the patch description
Commit 8f88f953580a0 partially fixed things by filtering out the From:
field, but it did not filter out the empty line (if present) after the
From: field, so it resulted in commit bodies which looked like this:
> Frobnozzle: this is a patch subject
>
>
> This is the patch description
instead of
> Frobnozzle: this is a patch subject
>
> This is the patch description
The ext4 patch queue has used this format for years, and this change
should not break other patches which look like mail headers and
bodies.
Signed-off-by: "Theodore Ts'o" <ty...@mit.edu>
---
guilt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guilt b/guilt
index 4edd1ad..309437a 100755
--- a/guilt
+++ b/guilt
@@ -365,7 +365,7 @@ do_get_header()
BEGIN{body=0; subj=0}
/^Subject:/ && (body == 0 && subj == 0){subj=1; print substr($0, 10) "\n";
next}
/^(Subject:|Author:|Date:|commit)/ && (body == 0){next}
-/^From:/ {next}
+/^From:/ {body=0; next}
/^(Commit-ID:|Gitweb:|AuthorDate:|Committer:CommitDate:)/ && (body == 0){next}
/^[ \t\f\n\r\v]*$/ && (body==0){next}
/^.*$/ && (body==0){body=1}
--
1.7.12.rc0.22.gcdd159b
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
