From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, Christian Couder <christian.couder@gmail.com>
Subject: Re: [RFC/PATCH 0/2] place cherry pick line below commit title
Date: Mon, 03 Oct 2016 12:17:33 -0700 [thread overview]
Message-ID: <xmqqbmz16y42.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <e03fdabd-6690-5244-5f79-1715b0364845@google.com> (Jonathan Tan's message of "Mon, 3 Oct 2016 10:44:54 -0700")
Jonathan Tan <jonathantanmy@google.com> writes:
> That sounds reasonable to me. Would a patch set to implement this new
> trailer block heuristic (in both sequencer and trailer) be reasonable?
> And if yes, should trailer know about the "(cherry picked from"
> prefix? (I can see it both ways - knowing about the "(cherry picked
> from" prefix would make it consistent with sequencer, but it seems
> like a detail that it shouldn't know about. Writing
> "Cherry-picked-from:" instead probably wouldn't solve our problem
> because, for backwards compatibility, we would still need to support
> reading the old format.)
If we were to go that route, I'd suggest keeping the historical
practice supported, exactly because you would need to be prepared to
cherry-pick an old commit.
It may be necessary for the code to analize the lines in a block
identified as "likely to be a trailing block" more carefully,
though. The example 59f0aa94 in the message you are responding to
has "Link 1:" that consists of 3 physical lines. An instruction to
interpret-trailers to add a new one _after_ "Link-$n:" may have to
treat these as a single logical line and do the addition after them,
i.e. before "Link 2:" line, for example.
I also saw
Signed-off-by: Some body <some@body.xz> (some comment
that extends to the next line without being indented)
Sined-off-by: Some body Else <some.body@else.xz>
where the only clue that the second line is logically a part of the
first one was the balancing of parentheses (or [brakets]). To
accomodate real-world use cases, you may have to take into account a
lot more than the strict rfc-822 style "line folding".
next prev parent reply other threads:[~2016-10-03 19:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-29 19:21 [RFC/PATCH 0/2] place cherry pick line below commit title Jonathan Tan
2016-09-29 19:21 ` [RFC/PATCH 1/2] sequencer: refactor message and origin appending Jonathan Tan
2016-09-29 19:21 ` [RFC/PATCH 2/2] sequencer: allow origin line below commit title Jonathan Tan
2016-09-29 21:56 ` [RFC/PATCH 0/2] place cherry pick " Junio C Hamano
2016-09-30 18:22 ` Jonathan Tan
2016-09-30 19:34 ` Junio C Hamano
2016-09-30 20:23 ` Jonathan Tan
2016-10-03 15:23 ` Junio C Hamano
2016-09-30 20:49 ` Junio C Hamano
2016-10-03 17:44 ` Jonathan Tan
2016-10-03 19:17 ` Junio C Hamano [this message]
2016-10-03 21:28 ` Jonathan Tan
2016-10-03 22:13 ` Junio C Hamano
2016-10-04 0:08 ` Jonathan Tan
2016-10-04 17:25 ` Junio C Hamano
2016-10-04 18:28 ` Junio C Hamano
2016-10-05 19:44 ` Jonathan Tan
2016-10-06 19:24 ` Junio C Hamano
2016-10-05 19:38 ` Jonathan Tan
2016-10-05 20:33 ` Junio C Hamano
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=xmqqbmz16y42.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@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).