From: Christian Couder Date: Sat, 06 Feb 2010 15:34:01 GMT Subject: Re: [PATCH 9/9] merge: use new "reset" function instead of running "git read-tree" Message-ID: <201002061634.02126.chriscool@tuxfamily.org> In-Reply-To: <7vbpg3nsbd.fsf@alter.siamese.dyndns.org> On samedi 06 février 2010, Junio C Hamano wrote: > Christian Couder writes: > > This simplifies "git merge" code and make it more efficient in some > > cases. > > I vaguely recall somebody (perhaps it was you) tried to do something like > this before to drive unpack_trees() inside the main process, broke the > program rather badly, and then we ended up keeping read-tree invocation > external to the process. Am I misremembering things? I don't think it was me and I don't recall that, but I don't follow all the threads on the mailing list. I will search the archive, but any pointer would be very appreciated. Thanks anyway, Christian. > If not, could you describe how is this round different from the old one?