Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-06 Thread Junio C Hamano
Jonathan Tan writes: > How important is this feature? It doesn't seem too difficult to add, > although it does break compatibility (in particular, "--signoff" must > now be documented as "after the last trailer" instead of "at the end > of the commit message"). The sign-off has always been meant

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-05 Thread Junio C Hamano
Jonathan Tan writes: > Sounds reasonable to me. Would the "[" be a bit of overspecification, > though, since Git doesn't produce it? Also, identifying it as a > garbage line probably wouldn't change any behavior - in the Linux > kernel examples, it is used to show what happened in between > sign-

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-05 Thread Jonathan Tan
On 10/04/2016 11:28 AM, Junio C Hamano wrote: An addendum. We may also want to be prepared to accept an input that has some garbage lines _after_ the trailer block, if we can clearly identify them as such. For example, we could change the definition of "the last paragraph" as "the block of line

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-05 Thread Jonathan Tan
On 10/04/2016 10:25 AM, Junio C Hamano wrote: So I would say it is perfectly OK if your update works only for cases we can clearly define the semantics for. For example, we can even start with something simple like: * A RFC822-header like line, together with any number of whitespace indente

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-04 Thread Junio C Hamano
Junio C Hamano writes: > A block of lines that appear as the last paragraph in a commit > message is a trailer block if and only if certain number or > percentage of lines are non-garbage lines according to the above > definition. > ... > I wonder if we can share a new helper function to do the d

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-04 Thread Junio C Hamano
Jonathan Tan writes: > One alternative is to postpone this decision by changing sequencer > only (and not trailer) to tolerate other lines in the trailer. This > would make them even more divergent (sequencer supports arbitrary > lines while trailer doesn't), but they were divergent already > (se

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-03 Thread Jonathan Tan
On 10/03/2016 03:13 PM, Junio C Hamano wrote: Jonathan Tan writes: There are other options like checking for indentation or checking for balanced parentheses/brackets, but I think that these would lead to surprising behavior for the user (this would mean that whitespace or certain characters c

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-03 Thread Junio C Hamano
Jonathan Tan writes: > There are other options like checking for indentation or checking for > balanced parentheses/brackets, but I think that these would lead to > surprising behavior for the user (this would mean that whitespace or > certain characters could turn a valid trailer into an invalid

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-03 Thread Jonathan Tan
On 10/03/2016 12:17 PM, Junio C Hamano wrote: 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 inst

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-03 Thread Junio C Hamano
Jonathan Tan 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 pi

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-03 Thread Jonathan Tan
On 09/30/2016 01:49 PM, Junio C Hamano wrote: Junio C Hamano writes: Jonathan Tan writes: I vaguely recall that there were some discussion on the definition of "what's a trailer line" with folks from the kernel land, perhaps while discussing the interpret-trailers topic. IIRC, when somebod

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-10-03 Thread Junio C Hamano
Jonathan Tan writes: > On 09/30/2016 12:34 PM, Junio C Hamano wrote: >>> 2) The Linux kernel's repository has some "commit ... upstream." lines >>> in this position (below the commit title) - for example, in commit >>> dacc0987fd2e. >> >> "A group of people seem to prefer it there" does not lead

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-09-30 Thread Junio C Hamano
Junio C Hamano writes: > Jonathan Tan writes: > >>> I vaguely recall that there were some discussion on the definition >>> of "what's a trailer line" with folks from the kernel land, perhaps >>> while discussing the interpret-trailers topic. IIRC, when somebody >>> passes an improved version al

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-09-30 Thread Jonathan Tan
On 09/30/2016 12:34 PM, Junio C Hamano wrote: 2) The Linux kernel's repository has some "commit ... upstream." lines in this position (below the commit title) - for example, in commit dacc0987fd2e. "A group of people seem to prefer it there" does not lead to "therefore let's move it there for e

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-09-30 Thread Junio C Hamano
Jonathan Tan writes: >> I vaguely recall that there were some discussion on the definition >> of "what's a trailer line" with folks from the kernel land, perhaps >> while discussing the interpret-trailers topic. IIRC, when somebody >> passes an improved version along, the resulting message's tra

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-09-30 Thread Jonathan Tan
On 09/29/2016 02:56 PM, Junio C Hamano wrote: Jonathan Tan writes: This is somewhat of a follow-up to my previous e-mail with subject "[PATCH] sequencer: support folding in rfc2822 footer" [1], in which I proposed relaxing the definition of a commit message footer to allow multiple-line field

Re: [RFC/PATCH 0/2] place cherry pick line below commit title

2016-09-29 Thread Junio C Hamano
Jonathan Tan writes: > This is somewhat of a follow-up to my previous e-mail with subject > "[PATCH] sequencer: support folding in rfc2822 footer" [1], in which I > proposed relaxing the definition of a commit message footer to allow > multiple-line field bodies (as described in RFC2822), but its

[RFC/PATCH 0/2] place cherry pick line below commit title

2016-09-29 Thread Jonathan Tan
This is somewhat of a follow-up to my previous e-mail with subject "[PATCH] sequencer: support folding in rfc2822 footer" [1], in which I proposed relaxing the definition of a commit message footer to allow multiple-line field bodies (as described in RFC2822), but its strictness was deemed delibera