diff test: reading a directory as a file need not error out
authorJonathan Nieder <jrnieder@gmail.com>
Fri, 10 Jan 2014 20:10:31 +0000 (12:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 23:30:45 +0000 (15:30 -0800)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4056-diff-order.sh
index 1ddd226b7850dbeecba255e2b4f4164ce2ff8b67..9e2b29ede508e3d0822f5eb607db2ae4896611e6 100755 (executable)
@@ -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)" '