From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Josh Bleecher Snyder <josharian@gmail.com>
Subject: Re: [RFC/PATCH] log: add log.firstparent option
Date: Fri, 24 Jul 2015 18:47:23 -0700 [thread overview]
Message-ID: <20150725014722.GA17830@peff.net> (raw)
In-Reply-To: <20150725013634.GA7269@peff.net>
On Fri, Jul 24, 2015 at 06:36:34PM -0700, Jeff King wrote:
> > I think in the cycle we merged Couder's trailer stuff we updated the
> > helper functions to locate where the S-o-b should go in an existing
> > message and consolidated (or, at least "talked about consolidating")
> > them into a single helper. I do not think we wrote any special case
> > for "a line with three-dashes and nothing else on it" when we did
> > so, but that function would be the logical place to do so.
>
> Yeah, it nicely has the concept of "ignore this footer". But we would
> want it only to kick in when doing emails (where the "---" is
> syntactically significant), I would think. So something like the patch
> below (no commit message because I'm in an airport right now; I'll add
> tests and repost in the next day or two).
This works for "format-patch -s". But I guess that leaves open the
question of "commit --signoff". It should not matter when making a
commit new (after all, you have not yet had a chance to put the "---"
in). But something like "git commit --amend --signoff" might want to
handle it. Of course we have no idea if any "---" we find there is meant
to be an email notes-separator by the user, or if they happened to use
"---" for something else[1] (which is a bad idea if you have an emailed
patches workflow, but many people do not). So it's a bit riskier.
-Peff
[1] While reading the old "git commit --notes" thread recently, Johan
Herland gave a plausible confusing example:
What
----
A commit message using markdown-like formatting conventions.
Why
---
To show that "---" can be part of a commit message. :)
next prev parent reply other threads:[~2015-07-25 1:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-23 1:23 [RFC/PATCH] log: add log.firstparent option Jeff King
2015-07-23 4:40 ` Config variables and scripting // was " David Aguilar
2015-07-23 5:14 ` Jeff King
2015-07-23 5:48 ` Jeff King
2015-07-23 6:32 ` Jacob Keller
2015-07-23 6:53 ` Jeff King
2015-07-23 6:55 ` Jacob Keller
2015-07-23 9:53 ` Michael J Gruber
2015-07-23 17:35 ` Jeff King
2015-07-23 17:37 ` Junio C Hamano
2015-07-23 22:14 ` Stefan Beller
2015-07-24 7:40 ` Jeff King
2015-07-24 7:46 ` Jacob Keller
2015-07-24 8:17 ` Jeff King
2015-07-24 15:31 ` Junio C Hamano
2015-07-25 1:36 ` Jeff King
2015-07-25 1:47 ` Jeff King [this message]
2015-07-25 17:18 ` Junio C Hamano
2015-07-27 4:43 ` Jeff King
2015-07-23 22:46 ` Junio C Hamano
2015-07-24 6:07 ` Jacob Keller
2015-07-24 7:34 ` Jeff King
2015-07-24 7:44 ` Jacob Keller
2015-07-24 15:04 ` Junio C Hamano
2015-07-24 18:13 ` Jeff King
2015-07-24 7:21 ` Jeff King
2015-07-24 7:23 ` Jeff King
2015-07-24 15:07 ` Junio C Hamano
2015-07-25 2:05 ` Jeff King
2015-07-25 17:41 ` Junio C Hamano
2015-07-25 22:41 ` Jacob Keller
2015-07-27 4:55 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150725014722.GA17830@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=josharian@gmail.com \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).