Re: CFT: merge-recursive in C

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 26, 2006, 23:54 UTC
Message-ID: <Pine.LNX.4.64.0606261652350.3927@g5.osdl.org>
In-Reply-To: <20060626233838.GA3121@steel.home>

On Tue, 27 Jun 2006, Alex Riesen wrote:

Show 6 quoted lines

> 
> To my deep disappointment, it didn't work out as good as I hoped: one
> program I see most often and for longest time in the process list
> (git-diff-tree) is a too complex thing to be put directly into
> merge-recursive.c, so any help in this direction will be greatly
> appreciated.

Are you sure?

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).

Some of the interfaces might be a bit non-obvious, but the diff stuff was some of the first ones to be libified exactly because they end up being so fundamental.

		Linus