git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Theodore Ts'o <tytso@mit.edu>
To: jeffpc@josefsipek.net
Cc: git@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH] guilt: skip empty line after from: line in patch descriptoin
Date: Tue, 21 May 2013 22:43:13 -0400	[thread overview]
Message-ID: <1369190593-6363-1-git-send-email-tytso@mit.edu> (raw)

Commit 2cc8d353d7ecb broke manually written patch descriptions of the
form:

    > Frobnozzle: this is a patch subject
    >
    > From: Fred McNurk <fred@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" <tytso@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

                 reply	other threads:[~2013-05-22  2:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369190593-6363-1-git-send-email-tytso@mit.edu \
    --to=tytso@mit.edu \
    --cc=git@vger.kernel.org \
    --cc=jeffpc@josefsipek.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).