Re: [PATCH 7/9] merge-recursive: handle return values indicating errors

2016-07-01 Thread Johannes Schindelin
Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/merge-recursive.c b/merge-recursive.c > > index 6ab7dfc..bb075e3 100644 > > --- a/merge-recursive.c > > +++ b/merge-recursive.c > > @@ -266,8 +266,10 @@ struct tree *write_tree_from_memory(stru

Re: [PATCH 7/9] merge-recursive: handle return values indicating errors

2016-06-29 Thread Junio C Hamano
Johannes Schindelin writes: > diff --git a/merge-recursive.c b/merge-recursive.c > index 6ab7dfc..bb075e3 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > @@ -266,8 +266,10 @@ struct tree *write_tree_from_memory(struct merge_options > *o) > active_cache_tree = cache_tre

[PATCH 7/9] merge-recursive: handle return values indicating errors

2016-06-29 Thread Johannes Schindelin
We are about to libify the recursive merge machinery, where we only die() in case of a bug or memory contention. To that end, we must heed negative return values as indicating errors. This requires our functions to be careful to pass through error conditions in call chains, and for quite a few fun