From: Junio C Hamano Date: Fri, 30 Jun 2006 02:04:20 GMT Subject: Re: Prepare "git-merge-tree" for future work Message-ID: <7vejx7mmaj.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds 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. You have a sets of filepairs, each of which is a pair of filespec, each of which describes the blob. And diff is about comparing them, possibly after running rename detection, pickaxe filtering and such. If the merge-tree's internal representation for each blob is more efficient or easier to use we could switch to use it as an improved implementation of filespec but I do not think that is what you meant, because I suspect that approach does not break diff from the "model". Care to elaborate a bit more please?