From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
To: Frans Pop <elendil@planet.nl>
Cc: git@vger.kernel.org
Subject: Re: Add option in git-am to ignore leading text?
Date: Tue, 28 Jul 2009 16:22:19 +0200 [thread overview]
Message-ID: <20090728142219.GA16168@vidovic> (raw)
In-Reply-To: <200907280513.59374.elendil@planet.nl>
The 28/07/09, Frans Pop wrote:
>
> That's a very useful feature. However, on lkml there are frequently also
> mails with the following structure (example: [1]).
>
> [1] http://lkml.org/lkml/2009/7/10/49
This is an example of what not to do. Content after the '---' won't be
part of the commit message.
$ man git-am
<snip>
The commit message is formed by the title taken from the "Subject: ",
a blank line and the body of the message up to where the patch begins.
Excess whitespace at the end of each line is automatically stripped.
The patch is expected to be inline, directly following the
message. Any line that is of the form:
· three-dashes and end-of-line, or
· a line that begins with "diff -", or
· a line that begins with "Index: "
is taken as the beginning of a patch, and the commit log message
is terminated before the first occurrence of such a line.
<snip>
> <example>
> [Regular mail headers, including From: and Subject:]
>
> [Comments, quotes from previous messages, or some introduction]
>
> From: [email address]
> Subject: [patch short description]
> [patch long description]
>
> [patch diff]
> </example>
>
> Here the overruling pseudo-headers are not at the beginning of the
> message, which results in all the leading comments getting included in
> the commit log and those have to be cleaned manually.
>
> Would it be possible to add an option to git-am to "reset" the commit log
> when it encounters either a From: or Subject: pseudo header, so that only
> the intended patch short and long descriptions are used for the commit
> log?
IMHO, a better way would be to ignore lines beginning with a defined
level of quotes in the commit message (the "level" beeing the number of
'>' or '> ' found at the beginning of a line. Something like
--strip-quotes[=N]
where N is the level of quoted lines to remove (if "=N" is
not given, assume that the level is 1 and remove all the quotes).
Comments?
--
Nicolas Sebrecht
next prev parent reply other threads:[~2009-07-28 14:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-28 3:13 Add option in git-am to ignore leading text? Frans Pop
2009-07-28 14:22 ` Nicolas Sebrecht [this message]
2009-07-28 14:31 ` Mark Brown
2009-07-28 17:38 ` Frans Pop
2009-07-28 18:15 ` Nicolas Sebrecht
2009-07-28 19:11 ` Frans Pop
2009-07-28 19:19 ` Frans Pop
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=20090728142219.GA16168@vidovic \
--to=nicolas.s.dev@gmx.fr \
--cc=elendil@planet.nl \
--cc=git@vger.kernel.org \
/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).