On Fri, Sep 26, 2008 at 11:20:03PM -0400, Leo Razoumov wrote:
> > git diff --name-status
> >
> > will show you the modified and deleted files. But since you are using
> > "-c" to show _all_ cached files, I think only ls-files can do that
> > (since diff is, obviously, about files with differences).
>
> Moreover, git diff would not show untracked files while git ls-files
> will include them and label '?'
Yes, but that is somewhat simpler to fix, since we know that they cannot
be part of the "git diff" output. That is, you can just append the "git
ls-files -v -o" output. Actually, since cached files use the 'H' tag
which doesn't conflict with git-diff, and since your goal was to combine
the multiple output anyway, I wonder if something like this would make
you happy:
(
git ls-files --exclude-standard -v -c -o &&
git diff --name-status --cached
) |
perl -e '
my %h;
while(<>) {
chomp;
my ($status, $name) = split / /, $_, 2;
$h{$name} .= $status;
}
print "$h{$_} $_\n" foreach sort keys(%h);
'
?
Personally, I find listing every cached file makes the output hard to
read, since any modified ones will be lost in the noise. But that is
what you said you wanted...
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
