From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jul 2016 22:19:59 GMT
Subject: Re: [PATCH v4 11/16] am -3: use merge_recursive() directly again
Message-ID: <xmqqy44p2wds.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <667d2f991f1423b138a746f4c685b13c5b572a83.1469187653.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> 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 of it specifically.

I've finished reading through up to this point and I'd stop for
now.

Some of the patches I didn't look beyond the context presented in
the patches, so it is very possible that I missed leaks caused by
early returns and things like that, but I didn't see anything
glaringly wrong.  Looks very promising.

Thanks.