From: Elijah Newren <newren@gmail.com>
Date: Thu, 04 Aug 2011 19:16:35 GMT
Subject: Re: [PATCH 00/48] Handling more corner cases in merge-recursive.c
Message-ID: <CABPp-BFx38gLQDn0sccp74Z=RtEVzaxWiVqopxkWwXTSGuYxxw@mail.gmail.com>
In-Reply-To: <7vpqkl3sok.fsf@alter.siamese.dyndns.org>

On Thu, Aug 4, 2011 at 1:03 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Elijah Newren <newren@gmail.com> writes:
>
>> ...  It
>> would be nice to make use of the original index we had before
>> unpacking, but that is overwritten at the end of unpack_trees.
>
> I somehow thought that we can give separate src and dst index
> to the unpack_tree() machinery these days. Aren't you using it?

Ah, yes, it appears to be possible.  I have not touched that part of
merge-recursive, so it still reads:
	opts.fn = threeway_merge;
	opts.src_index = &the_index;
	opts.dst_index = &the_index;
	setup_unpack_trees_porcelain(&opts, "merge");
I'll take that route to fix this.

Thanks.