Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Junio C Hamano
Jeff King writes: > So if we are comfortable with saying that this is a new feature to have > the machine-readable trailer version, and there isn't a robust way to > get historical revert information (because there really isn't[1]), then > I think we can just punt on any kind of trailer-normaliza

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Jeff King
On Thu, Nov 08, 2018 at 09:36:56AM +0900, Junio C Hamano wrote: > Duy Nguyen writes: > > > There is still one thing to settle. "revert -m1" could produce > > something like this > > > > This reverts commit , reversing > > changes made to . > > I do not think it is relevant, with or with

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Junio C Hamano
Duy Nguyen writes: > There is still one thing to settle. "revert -m1" could produce > something like this > > This reverts commit , reversing > changes made to . I do not think it is relevant, with or without multiple parents, to even attempt to read this message. The description is not

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Jeff King
On Wed, Nov 07, 2018 at 04:30:38PM +0100, Duy Nguyen wrote: > > Could we help the reading scripts by normalizing old and new output via > > interpret-trailers, %(trailers), etc? > > > > I think "(cherry picked from ...)" is already considered a trailer by > > the trailer code. If the caller instru

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-07 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 11:11 PM Jeff King wrote: > > On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > The implementation looks fine to me, but as noted in > > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > > wonder what the plausible end-game is.

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Junio C Hamano
Jeff King writes: > Could we help the reading scripts by normalizing old and new output via > interpret-trailers, %(trailers), etc? > > I think "(cherry picked from ...)" is already considered a trailer by > the trailer code. ;-) Great minds think alike, I guess. I think it is a great idea t

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > OK here is a less constroversal attempt to add new trailers. Instead > of changing the default behavior (which could be done incrementally > later), this patch simply adds a new option --append-trailer to revert > and cherry-pick. I almost agree, except that the t

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 05:11:18PM -0500, Jeff King wrote: > On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > The implementation looks fine to me, but as noted in > > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > > wonder what the plausible end

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > The implementation looks fine to me, but as noted in > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > wonder what the plausible end-game is. That we'll turn this on by > default in a few years, and the

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Nguyễn Thái Ngọc Duy wrote: > OK here is a less constroversal attempt to add new trailers. Instead > of changing the default behavior (which could be done incrementally > later), this patch simply adds a new option --append-trailer to revert > and cherry-pick. > > Both will

[PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Nguyễn Thái Ngọc Duy
OK here is a less constroversal attempt to add new trailers. Instead of changing the default behavior (which could be done incrementally later), this patch simply adds a new option --append-trailer to revert and cherry-pick. Both will show either Reverts: [~] or Cherry-picked-from: [~]