Re: [PATCH 4/9] merge_recursive: abort properly upon errors

Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > saved_b2 = o->branch2; > >> > o->branch1 = "Temporary merge branch 1"; > >> > o->branch2 = "Temporary merge branch 2"; > >> > -merge_recu

Re: [PATCH 4/9] merge_recursive: abort properly upon errors

Johannes Schindelin writes: >> >saved_b2 = o->branch2; >> >o->branch1 = "Temporary merge branch 1"; >> >o->branch2 = "Temporary merge branch 2"; >> > - merge_recursive(o, merged_common_ancestors, iter->item, >> > - NULL, &merge

Re: [PATCH 4/9] merge_recursive: abort properly upon errors

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > There are a couple of places where return values indicating errors > > are ignored. Let's teach them manners. > > > > Signed-off-by: Johannes Schindelin > > --- > > merge-recursive.c | 10 -- > >

Re: [PATCH 4/9] merge_recursive: abort properly upon errors

Johannes Schindelin writes: > There are a couple of places where return values indicating errors > are ignored. Let's teach them manners. > > Signed-off-by: Johannes Schindelin > --- > merge-recursive.c | 10 -- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/merge-re

[PATCH 4/9] merge_recursive: abort properly upon errors

There are a couple of places where return values indicating errors are ignored. Let's teach them manners. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index bcb53f0..c