Re: [PATCH] Also use unpack_trees() in do_diff_cache()

On Sun, 20 Jan 2008, Johannes Schindelin wrote:

Oh, absolutely.

It's not "git diff HEAD" that is broken.

It's "git diff --cached HEAD" that doesn't work. The "--cached" means that it's supposed to diff the index against HEAD, but since it cannot handle unmerged entries, instead of getting a diff, you get just a line saying

	* Unmerged path xyzzy

and no diff at all.

That's the thing we should think about improving on (although it's not 100% clear that a combined diff is the rigth thing either).

Anyway, to make it easier for people to follow along with this, I've put my whole series now on kernel.org in a "new-lstat" branch at:

	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/git.git new-lstat

(That git repo is a bit odd, it doesn't have any "master" branch at all, just that new-lstat one. I didn't want anybody to think that it's anything but a temporary git tree for this one series of patches. It will clone into an odd kind of repo that only has a "origin/new-lstat" remote branch, nothing else).

I'll probably rebase that thing if I keep working on it, but I think it's pretty good.

		Linus