Johannes Schindelin writes:
> If you want, I can break out the subsequent patches into a separate
> series.
I do not think that would help anybody, as we'll have to review them
anyway. If some of the the later ones were "oops, this earlier step
did an incomplete job and here is a fix-up", then
Hi Junio,
On Mon, 25 Jul 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Note: the code now calls merge_recursive_generic() again. Unlike
> > merge_trees() and merge_recursive(), this function returns 0 upon success,
> > as most of Git's functions. Therefore, the error value -1
Johannes Schindelin writes:
> Note: the code now calls merge_recursive_generic() again. Unlike
> merge_trees() and merge_recursive(), this function returns 0 upon success,
> as most of Git's functions. Therefore, the error value -1 naturally is
> handled correctly, and we do not have to take care
Last October, we had to change this code to run `git merge-recursive`
in a child process: git-am wants to print some helpful advice when the
merge failed, but the code in question was not prepared to return, it
die()d instead.
We are finally at a point when the code *is* prepared to return errors,
4 matches
Mail list logo
