Re: Prepare "git-merge-tree" for future work

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 30, 2006, 02:32 UTC
Message-ID: <Pine.LNX.4.64.0606291925230.12404@g5.osdl.org>
In-Reply-To: <7vejx7mmaj.fsf@assigned-by-dhcp.cox.net>

On Thu, 29 Jun 2006, Junio C Hamano wrote:

Show 8 quoted lines

> Linus Torvalds <torvalds@osdl.org> writes:
> 
> > I punted on trying to use the proper git diff interfaces (they are very 
> > tightly tied into the "diff_filespec" model - Junio, it might be nice if 
> > there was some way to use them in a setting where that isn't necessarily 
> > as natural).
> 
> I am not quite sure what you mean.

For what I wanted to do, I didn't see an easy way to add/populate a new filespec. It was easier to just use the raw libxdiff interfaces, but that's really just because I know the interfaces.

In contrast, the ones to diff_filespec I've never really used, and I did not want to compare blob objects, I very much wanted to compare in-memory buffers (_and_ potentially blobs).

So if you can show an easy example of how to populate a set of filespec pairs (not with blobs - with in-memory generated data) and insert them onto the lists, that would be good.

In fact, maybe you can show me what git-merge-tree needs to do..

Hint hint.

		Linus