Re: [PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value

Johannes Schindelin writes: > Actually, come to think of it, I will change the patch, as it is too > confusing. What I want is to preserve a positive return value in case of > merge conflicts, and that is exactly what I should do instead of playing > games with the Boolean OR operator. That woul

Re: [PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value

Hi Junio, On Mon, 12 Sep 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The return value of do_recursive_merge() may be positive (indicating merge > > conflicts), so let's OR later error conditions so as not to overwrite them > > with 0. > > Are the untold assumptions as follo

Re: [PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value

Johannes Schindelin writes: > The return value of do_recursive_merge() may be positive (indicating merge > conflicts), so let's OR later error conditions so as not to overwrite them > with 0. Are the untold assumptions as follows? - The caller wants to act on positive (not quite an error), zer

[PATCH v2 19/25] sequencer: remember do_recursive_merge()'s return value

The return value of do_recursive_merge() may be positive (indicating merge conflicts), so 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: Johanne