Home » Mailing list archives » git » 2008 » January » 20

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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Linus Torvalds <torvalds@...>
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: Steffen Prohaska <prohaska@...>, Junio C Hamano <gitster@...>, Git Mailing List <git@...>
Subject: Re: [PATCH] Also use unpack_trees() in do_diff_cache()
Date: Sunday, January 20, 2008 - 7:58 pm

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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Updated in-memory index cleanup, Linus Torvalds, (Fri Jan 18, 11:25 pm)
[PATCH] Avoid running lstat(2) on the same cache entry., Junio C Hamano, (Sat Jan 19, 3:45 am)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Linus Torvalds, (Sat Jan 19, 3:47 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Linus Torvalds, (Sat Jan 19, 9:22 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Johannes Schindelin, (Sat Jan 19, 10:42 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Johannes Schindelin, (Sat Jan 19, 9:48 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Steffen Prohaska, (Sun Jan 20, 11:10 am)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Linus Torvalds, (Sun Jan 20, 2:20 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Steffen Prohaska, (Sun Jan 20, 5:40 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Linus Torvalds, (Sun Jan 20, 6:09 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Brian Downing, (Sun Jan 20, 4:03 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Johannes Schindelin, (Sun Jan 20, 11:18 am)
[PATCH] Try to resurrect the handling for 'diff-index -m', Johannes Schindelin, (Sun Jan 20, 11:21 am)
[PATCH] Also use unpack_trees() in do_diff_cache(), Johannes Schindelin, (Sun Jan 20, 11:19 am)
Re: [PATCH] Also use unpack_trees() in do_diff_cache(), Linus Torvalds, (Sun Jan 20, 4:32 pm)
Re: [PATCH] Also use unpack_trees() in do_diff_cache(), Linus Torvalds, (Sun Jan 20, 5:53 pm)
Re: [PATCH] Also use unpack_trees() in do_diff_cache(), Johannes Schindelin, (Sun Jan 20, 7:34 pm)
Re: [PATCH] Also use unpack_trees() in do_diff_cache(), Linus Torvalds, (Sun Jan 20, 7:58 pm)
Re: [PATCH] Also use unpack_trees() in do_diff_cache(), Johannes Schindelin, (Sun Jan 20, 8:19 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Steffen Prohaska, (Sun Jan 20, 6:33 am)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Junio C Hamano, (Sun Jan 20, 8:18 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Johannes Schindelin, (Sun Jan 20, 10:15 am)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Linus Torvalds, (Sat Jan 19, 10:02 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Linus Torvalds, (Sat Jan 19, 9:34 pm)
Re: [PATCH] Avoid running lstat(2) on the same cache entry., Linus Torvalds, (Sat Jan 19, 3:58 pm)
[PATCH] index: be careful when handling long names, Junio C Hamano, (Sat Jan 19, 3:42 am)