Fabian Ruch baf...@gmail.com writes:
On 05/27/2014 08:42 PM, Junio C Hamano wrote:
Fabian Ruch baf...@gmail.com 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
On 06/10/2014 01:56 PM, Junio C Hamano wrote:
Fabian Ruch baf...@gmail.com writes:
On 05/27/2014 08:42 PM, Junio C Hamano wrote:
Fabian Ruch baf...@gmail.com writes:
[..]
In order to signal the three possible situations (not only success and
failure to complete) after a pick through
Phil Hord ho...@cisco.com 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
Hi Junio,
On 05/27/2014 08:42 PM, Junio C Hamano wrote:
Fabian Ruch baf...@gmail.com 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
Fabian Ruch baf...@gmail.com 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
`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 failed merge due to conflict
3. any
6 matches
Mail list logo
