Re: CFT: merge-recursive in C

From: Junio C Hamano <junkio@cox.net>
Date: Jun 27, 2006, 00:27 UTC
Message-ID: <7vzmfzfnoe.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060627002439.GD3121@steel.home>

fork0@t-online.de (Alex Riesen) writes:

Show 14 quoted lines

> Linus Torvalds, Tue, Jun 27, 2006 02:07:02 +0200:
>> > 
>> > git-diff-tree is one of the simplest git operations. We've got absolutely 
>> > _tons_ of infrastructure in place to do it efficiently, since it's done 
>> > all over the map (a "git-rev-list" with path limiting will do a diff-tree 
>> > against all the commits).
>> 
>> Side note - I think merge-recursive could/should be rewritten to use 
>> "git-merge-tree" instead of "git-read-tree -u -m". I suspect that the 
>> git-merge-tree output is in fact a lot closer to what git-merge-recursive 
>> actually wants to have.
>> 
>
> Yep. And does not touch the index, too. Cool...

Actually "does not touch the index" part is a defect in merge-tree. It is fine at the recursive level, but at the top level we need to make sure the local changes do not interfere with the merge.