[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <alpine.LFD.1.00.0801301947540.3426@www.l.google.com>
Date: Wed, 30 Jan 2008 19:52:20 +1100 (EST)
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Theodore Tso <tytso@....EDU>
cc: Jan Engelhardt <jengelh@...putergmbh.de>,
linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] ext4 update
On Wed, 30 Jan 2008, Theodore Tso wrote:
>
> That's because you are doing a diff stat of changes that haven't been
> checked in yet. I was doing a "git log -p origin.. | diffstat -p1",
> and in that incantation you definitely do need the -p1 to diffstat.
You should *always* use "-p1" to diffstat, because if you don't, diffstat
just makes up the paths totally (the same way you should always use "-p1"
to GNU 'patch').
The fact is, diffstat just guesses, based on the prefix. But those guesses
will be totally bogus at times, especially if you have newly created files
(I _think_ that is because one of the pathnames in the diff is /dev/null,
and that will apparently throw off the guesses).
So if you don't use an explicit "-p1", diffstat will guess the -p level
from the longest common path prefix, _but_ get that wrong for some paths
anyway, so sometimes you'll see the "a/" prefix etc.
Of course, rather than using diffstat at all, just do something like
git diff --stat origin..
instead.
Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists