Re: [PATCH 8/9] merge-recursive: switch to returning errors instead of dying

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > @@ -743,6 +741,8 @@ static int update_file_flags(struct merge_options *o, > > int update_cache, > > int update_wd) > > ... > > + ret = e

Re: [PATCH 8/9] merge-recursive: switch to returning errors instead of dying

Johannes Schindelin writes: > @@ -743,6 +741,8 @@ static int update_file_flags(struct merge_options *o, > int update_cache, > int update_wd) > ... > + ret = error_errno(_("do not know what to do with %06o > %s '%s'"), >

[PATCH 8/9] merge-recursive: switch to returning errors instead of dying

The recursive merge machinery is supposed to be a library function, i.e. it should return an error when it fails. Originally the functions were part of the builtin "merge-recursive", though, where it was simpler to call die() and be done with error handling. The existing callers were already prepa