Merge branch 'sb/diff-orderfile-config'

Finishing touches to avoid casting unnecessary detail in stone.

* sb/diff-orderfile-config:
  diff test: reading a directory as a file need not error out
This commit is contained in:
Junio C Hamano 2014-01-13 11:34:11 -08:00
commit 7fe5e637ab

View File

@ -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)" '