Re: [PATCH] Test case for "git diff" outside a git repo

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 24, 2007, 09:24 UTC
Message-ID: <Pine.LNX.4.64.0707241024350.14781@racer.site>
In-Reply-To: <7vy7h6ib0b.fsf@assigned-by-dhcp.cox.net>

Hi,

On Mon, 23 Jul 2007, Junio C Hamano wrote:

Show 20 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
> 
> > Steven Grimm <koreth@midwinter.com> writes:
> >
> >> Signed-off-by: Steven Grimm <koreth@midwinter.com>
> >> ---
> >> 	git-diff --quiet is pretty broken right now. If you do
> >> 	"strace git diff --quiet file1 file2" you will see that
> >> 	it never calls open() on either file! And it always
> >> 	returns a zero exit code whether or not the files are
> >> 	different.
> >>
> >> 	I'm trying to follow the code to figure out what's going on,
> >> 	but meanwhile, here's a test case. Perhaps someone more
> >> 	familiar with the diff code will beat me to a fix.
> 
> The code to do "untracked diff" is an ugly stepchild and not really part 
> of git-diff proper.  In fact, --quiet also is an afterthought and I 
> would not be too surprised if the "untracked diff" code does not work 
> with it.

Not that ugly, mind you. Every third day or so I congratulate myself for having "git diff --color-words" or "git diff -M", without having to suffer initialising a git repository.

But yes, I agree, the --quiet code came after the --no-index code, and thus it is well possible that the latter ignores the former.

Show 18 quoted lines

> >> diff --git a/t/t4021-diff-norepo.sh b/t/t4021-diff-norepo.sh
> >> new file mode 100755
> >> index 0000000..dfee3d7
> >> --- /dev/null
> >> +++ b/t/t4021-diff-norepo.sh
> >> @@ -0,0 +1,26 @@
> >> +#!/bin/sh
> >> +
> >> +test_description='test git diff outside a repo'
> >> +
> >> +. ./test-lib.sh
> >> +
> >> +rm -rf .git
> 
> Unless you are testing the t/ directory and git.git suite from a 
> tarball, the only effect of this is to make t/trash controlled by its 
> ../../.git repository (i.e. the git.git repository).  You are still 
> inside a git repository.

Yes, this is no good.

However, you can force --no-index.  IMHO that is the way to go.

Ciao, Dscho