Re: [RFC 1/3] sequencer: Signal failed ff as an aborted, not a conflicted merge

2014-06-10 Thread Junio C Hamano
Phil Hord writes: >> In any case, I agree that exiting with 1 that signals "failed with >> conflict" can be confusing to the caller. Can we have a test to >> demonstrate when this fix matters? > > I think you are asking for a test and not for clarification. But a test > was provided in 3/3 in t

Re: [RFC 1/3] sequencer: Signal failed ff as an aborted, not a conflicted merge

2014-06-10 Thread Phil Hord
On 06/10/2014 01:56 PM, Junio C Hamano wrote: > Fabian Ruch writes: > >> On 05/27/2014 08:42 PM, Junio C Hamano wrote: >>> Fabian Ruch writes: [..] In order to signal the three possible situations (not only success and failure to complete) after a pick through porcelain comma

Re: [RFC 1/3] sequencer: Signal failed ff as an aborted, not a conflicted merge

2014-06-10 Thread Junio C Hamano
Fabian Ruch writes: > On 05/27/2014 08:42 PM, Junio C Hamano wrote: >> Fabian Ruch writes: >>> [..] >>> >>> In order to signal the three possible situations (not only success and >>> failure to complete) after a pick through porcelain commands such as >>> `cherry-pick`, exit with a return value

Re: [RFC 1/3] sequencer: Signal failed ff as an aborted, not a conflicted merge

2014-06-09 Thread Fabian Ruch
Hi Junio, On 05/27/2014 08:42 PM, Junio C Hamano wrote: > Fabian Ruch writes: >> [..] >> >> In order to signal the three possible situations (not only success and >> failure to complete) after a pick through porcelain commands such as >> `cherry-pick`, exit with a return value that is neither 0 n

Re: [RFC 1/3] sequencer: Signal failed ff as an aborted, not a conflicted merge

2014-05-27 Thread Junio C Hamano
Fabian Ruch writes: > `do_pick_commit` handles three situations if it is not fast-forwarding. > In order for `do_pick_commit` to identify the situation, it examines the > return value of the selected merge command. > > 1. return value 0 stands for a clean merge > 2. 1 is passed in case of a faile