Re: [PATCH v2 00/17] Use merge_recursive() directly in the builtin am

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 7, 2016, 11:16 UTC
Message-ID: <alpine.DEB.2.20.1607071313560.6426@virtualbox>
In-Reply-To: <xmqqwpkyqwzh.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Wed, 6 Jul 2016, Junio C Hamano wrote:

Show 12 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > This is the second iteration of the long-awaited re-roll of the attempt to
> > avoid spawning merge-recursive from the builtin am and use merge_recursive()
> > directly instead.
> 
> I wanted to queue this in 'pu', but an unfortunate series that
> changes the convert_to_git() infrastructure has serious conflicts
> with the changes in this series.  I am still unsure if these
> changes cannot be done without butchering the calling convention
> of what leads to convert_to_git(), but in the meantime, this cannot
> yet be merged to 'pu'.

There is nothing butchered there. The secret to the merge conflicts is the sha1 -> oid conversion paired with Vasco's untranslating of BUG: reports without upcasing the "bug:" prefix.

I will rebase to `pu` and re-send.

Ciao, Dscho