Re: [PATCH v3 5/6] trailer: allow non-trailers in trailer block

2016-10-19 Thread Junio C Hamano
Jonathan Tan writes: > Would this work then: > - at least one trailer line generated by Git ("(cherry picked by" or > "Signed-off-by: ") or configured in the "trailer" section in > git config AND at least 25% logical trailer lines > OR > - 100% logical trailer lines Sure. At that point, I

Re: [PATCH v3 5/6] trailer: allow non-trailers in trailer block

2016-10-19 Thread Jonathan Tan
On 10/18/2016 09:36 AM, Junio C Hamano wrote: Jonathan Tan writes: * rs/c-auto-resets-attributes: pretty: avoid adding reset for %C(auto) if output is empty And neither of the two colon containing line remotely resembles how a typical RFC-822 header is formatted. So that may serve

Re: [PATCH v3 5/6] trailer: allow non-trailers in trailer block

2016-10-18 Thread Junio C Hamano
Jonathan Tan writes: >> * rs/c-auto-resets-attributes: >> pretty: avoid adding reset for %C(auto) if output is empty >> >> And neither of the two colon containing line remotely resembles how >> a typical RFC-822 header is formatted. So that may serve as a hint >> to how we can tighten

Re: [PATCH v3 5/6] trailer: allow non-trailers in trailer block

2016-10-17 Thread Jonathan Tan
On 10/17/2016 06:42 PM, Junio C Hamano wrote: Stefan Beller writes: On Fri, Oct 14, 2016 at 10:38 AM, Jonathan Tan wrote: Existing trailers are extracted from the input message by looking for -a group of one or more lines that contain a colon (by default), where +a group of one or more lin

Re: [PATCH v3 5/6] trailer: allow non-trailers in trailer block

2016-10-17 Thread Junio C Hamano
Stefan Beller writes: > On Fri, Oct 14, 2016 at 10:38 AM, Jonathan Tan > wrote: >> >> Existing trailers are extracted from the input message by looking for >> -a group of one or more lines that contain a colon (by default), where >> +a group of one or more lines in which at least one line cont

Re: [PATCH v3 5/6] trailer: allow non-trailers in trailer block

2016-10-17 Thread Stefan Beller
On Fri, Oct 14, 2016 at 10:38 AM, Jonathan Tan wrote: > > Existing trailers are extracted from the input message by looking for > -a group of one or more lines that contain a colon (by default), where > +a group of one or more lines in which at least one line contains a > +colon (by default), whe

[PATCH v3 5/6] trailer: allow non-trailers in trailer block

2016-10-14 Thread Jonathan Tan
Currently, interpret-trailers requires all lines of a trailer block to be trailers (or comments) - if not it would not identify that block as a trailer block, and thus create its own trailer block, inserting a blank line. For example: echo -e "\na: b\nnot trailer" | git interpret-trailers --t