Re: [PATCH v4 06/16] merge_recursive: abort properly upon errors

2016-07-26 Thread Johannes Schindelin
Hi Junio, On Mon, 25 Jul 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. > > That is because the return value never indicated errors before this > series, isn't it? A

Re: [PATCH v4 06/16] merge_recursive: abort properly upon errors

2016-07-25 Thread Junio C Hamano
Johannes Schindelin writes: > There are a couple of places where return values indicating errors > are ignored. Let's teach them manners. That is because the return value never indicated errors before this series, isn't it? A true error used to be expressed by dying, and the return value indica

[PATCH v4 06/16] merge_recursive: abort properly upon errors

2016-07-22 Thread Johannes Schindelin
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 dc3182b..2