From: Junio C Hamano <gitster@pobox•com>
To: Jonathan Nieder <jrnieder@gmail•com>
Cc: Samuel Bronson <naesten@gmail•com>,
git@vger•kernel.org, Anders Waldenborg <anders@0x63•nu>,
Antoine Pelisse <apelisse@gmail•com>
Subject: Re: [PATCH sb/diff-orderfile-config] diff test: reading a directory as a file need not error out
Date: Fri, 10 Jan 2014 15:30:11 -0800 [thread overview]
Message-ID: <xmqq4n5b8lfg.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140110201031.GI4776@google.com> (Jonathan Nieder's message of "Fri, 10 Jan 2014 12:10:31 -0800")
Jonathan Nieder <jrnieder@gmail•com> writes:
> There is no guarantee that strbuf_read_file must error out for
> directories. On some operating systems (e.g., Debian GNU/kFreeBSD
> wheezy), reading a directory gives its raw content:
>
> $ head -c5 < / | cat -A
> ^AM-|^_^@^L$
>
> As a result, 'git diff -O/' succeeds instead of erroring out on
> these systems, causing t4056.5 "orderfile is a directory" to fail.
>
> On some weird OS it might even make sense to pass a directory to the
> -O option and this is not a common user mistake that needs catching.
> Remove the test.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail•com>
> ---
> Hi,
>
> t4056 is failing on systems using glibc with the kernel of FreeBSD[1]:
>
> | expecting success:
> | test_must_fail git diff -O/ --name-only HEAD^..HEAD
> |
> | a.h
> | b.c
> | c/Makefile
> | d.txt
> | test_must_fail: command succeeded: git diff -O/ --name-only HEAD^..HEAD
> | not ok 5 - orderfile is a directory
>
> How about this patch?
Sounds sensible. Thanks.
> Thanks,
> Jonathan
>
> [1] https://buildd.debian.org/status/fetch.php?pkg=git&arch=kfreebsd-amd64&ver=1%3A2.0~next.20140107-1&stamp=1389379274
>
> t/t4056-diff-order.sh | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
> index 1ddd226..9e2b29e 100755
> --- a/t/t4056-diff-order.sh
> +++ b/t/t4056-diff-order.sh
> @@ -68,10 +68,6 @@ test_expect_success POSIXPERM,SANITY 'unreadable orderfile' '
> test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
> '
>
> -test_expect_success 'orderfile is a directory' '
> - test_must_fail git diff -O/ --name-only HEAD^..HEAD
> -'
> -
> for i in 1 2
> do
> test_expect_success "orderfile using option ($i)" '
next prev parent reply other threads:[~2014-01-10 23:30 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 10:31 [PATCH] diff: Add diff.orderfile configuration variable Anders Waldenborg
2013-10-21 18:40 ` Jonathan Nieder
2013-10-25 10:24 ` Anders Waldenborg
2013-12-06 6:48 ` [PATCH v2] " Samuel Bronson
2013-12-06 18:11 ` Junio C Hamano
2013-12-07 2:43 ` Samuel Bronson
2013-12-09 19:23 ` Junio C Hamano
2013-12-14 22:18 ` [PATCH v3 0/3] " Samuel Bronson
2013-12-14 22:18 ` [PATCH v3 1/3] diff: Tests for "git diff -O" Samuel Bronson
2013-12-14 22:18 ` [PATCH v3 2/3] diff: Let "git diff -O" read orderfile from any file, failing when appropriate Samuel Bronson
2013-12-16 18:43 ` Junio C Hamano
2013-12-14 22:18 ` [RFC v3 3/3] diff: Add diff.orderfile configuration variable Samuel Bronson
2013-12-16 18:53 ` Junio C Hamano
2013-12-16 19:21 ` Samuel Bronson
2013-12-16 20:09 ` [PATCH v4 0/3] " Samuel Bronson
2013-12-16 20:09 ` [PATCH v4 1/3] diff: Tests for "git diff -O" Samuel Bronson
2013-12-16 20:09 ` [PATCH v4 2/3] diff: Let "git diff -O" read orderfile from any file, fail properly Samuel Bronson
2013-12-16 21:09 ` Junio C Hamano
2013-12-17 4:06 ` Samuel Bronson
2013-12-16 21:32 ` Junio C Hamano
2013-12-17 5:03 ` Samuel Bronson
2013-12-17 17:54 ` Junio C Hamano
2013-12-17 20:37 ` Antoine Pelisse
2013-12-17 22:09 ` Junio C Hamano
2013-12-18 4:28 ` Samuel Bronson
2013-12-18 5:47 ` Junio C Hamano
2013-12-17 23:11 ` Junio C Hamano
2013-12-16 20:09 ` [PATCH v4 3/3] diff: Add diff.orderfile configuration variable Samuel Bronson
2013-12-19 0:08 ` [PATCH v5 0/3] " Samuel Bronson
2013-12-19 0:40 ` Junio C Hamano
2013-12-19 0:08 ` [PATCH v5 1/3] diff: Tests for "git diff -O" Samuel Bronson
2013-12-19 0:08 ` [PATCH v5 2/3] diff: Let "git diff -O" read orderfile from any file, fail properly Samuel Bronson
2014-01-10 20:10 ` [PATCH sb/diff-orderfile-config] diff test: reading a directory as a file need not error out Jonathan Nieder
2014-01-10 23:30 ` Junio C Hamano [this message]
2013-12-19 0:08 ` [PATCH v5 3/3] diff: Add diff.orderfile configuration variable Samuel Bronson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4n5b8lfg.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=anders@0x63$(echo .)nu \
--cc=apelisse@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=naesten@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox