Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

2016-08-29 Thread Junio C Hamano
Jakub Narębski writes: > W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > >> diff --git a/sequencer.c b/sequencer.c >> index 5ec956f..0614b90 100644 >> --- a/sequencer.c >> +++ b/sequencer.c >> @@ -623,7 +623,7 @@ static int do_pick_commit(enum todo_command command, >>

Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

2016-08-29 Thread Jakub Narębski
W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > diff --git a/sequencer.c b/sequencer.c > index 5ec956f..0614b90 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -623,7 +623,7 @@ static int do_pick_commit(enum todo_command command, > struct commit *commit, > const char

Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

2016-08-29 Thread Johannes Schindelin
Hi Dennis, On Mon, 29 Aug 2016, Dennis Kaarsemaker wrote: > On ma, 2016-08-29 at 10:06 +0200, Johannes Schindelin wrote: > > > The return value of do_recursive_merge() may be positive (indicating merge > > conflicts), se let's OR later error conditions so as not to overwrite them > > with 0. >

Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

2016-08-29 Thread Dennis Kaarsemaker
On ma, 2016-08-29 at 10:06 +0200, Johannes Schindelin wrote: > The return value of do_recursive_merge() may be positive (indicating merge > conflicts), se let's OR later error conditions so as not to overwrite them > with 0. s/se/so/? D.

[PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

2016-08-29 Thread Johannes Schindelin
The return value of do_recursive_merge() may be positive (indicating merge conflicts), se let's OR later error conditions so as not to overwrite them with 0. This is not yet a problem, but preparing for the patches to come: we will teach the sequencer to do rebase -i's job. Signed-off-by: