From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Jul 2018 16:08:43 GMT
Subject: Re: git merge -s subtree seems to be broken.
Message-ID: <xmqqlg9rcrqs.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180731155027.GA16910@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> The problem introduced in that commit is that each iteration through the
> loop advances the tree pointers.

Ah, indeed.  

The original used tree_entry_extract() and update_tree_entry()
separately, but the update does tree_entry() on both sides.

> So the assertion in that commit message that "the calls to
> update_tree_entry() are not needed any more" is just wrong. We have
> decide whether to call it based on the "cmp" value.

Yup.