diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2014-01-10 12:10:31 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-01-10 15:30:45 -0800 |
| commit | 0df49bef95fe1668805cdb76abadfb82a8956b6b (patch) | |
| tree | e86161819d57cf7abdd8ba2af3aeb22fc118f0d1 | |
| parent | diff: add diff.orderfile configuration variable (diff) | |
| download | tgif-0df49bef95fe1668805cdb76abadfb82a8956b6b.tar.xz | |
diff test: reading a directory as a file need not error out
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>
| -rwxr-xr-x | t/t4056-diff-order.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh index 1ddd226b78..9e2b29ede5 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)" ' |