# [PATCH] Test case for "git diff" outside a git repo 3 messages from 2007-07-23 to 2007-07-24. Participants: Steven Grimm, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/9174 ## Steven Grimm, 2007-07-23 13:22 Subject: [PATCH] Test case for "git diff" outside a git repo Message-ID: <20070723132248.GA24122@midwinter.com> URL: https://gitlist.dev/e/20070723132248.GA24122%40midwinter.com ``` Signed-off-by: Steven Grimm --- 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. t/t4021-diff-norepo.sh | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) create mode 100755 t/t4021-diff-norepo.sh 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 + +test_expect_success setup ' + + echo content1 >file1a && + echo content1 >file1b && + echo content2 >file2 +' + +test_expect_success 'zero return value with --quiet for different files' ' + + git diff --quiet file1a file2 +' + +test_expect_success 'nonzero return value with --quiet for identical files' ' + + ! git diff --quiet file1a file1b >/dev/null +' + +test_done -- 1.5.3.rc2.4.g726f9 ``` ## Junio C Hamano, 2007-07-24 06:14 Subject: Re: [PATCH] Test case for "git diff" outside a git repo Message-ID: <7vy7h6ib0b.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vy7h6ib0b.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20070723132248.GA24122@midwinter.com> ``` Junio C Hamano writes: > Steven Grimm writes: > >> Signed-off-by: Steven Grimm >> --- >> 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. >> 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. ``` ## Johannes Schindelin, 2007-07-24 09:24 Subject: Re: [PATCH] Test case for "git diff" outside a git repo Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0707241024350.14781%40racer.site In-Reply-To: <7vy7h6ib0b.fsf@assigned-by-dhcp.cox.net> ``` Hi, On Mon, 23 Jul 2007, Junio C Hamano wrote: > Junio C Hamano writes: > > > Steven Grimm writes: > > > >> Signed-off-by: Steven Grimm > >> --- > >> 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. > >> 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 ```