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
git-mirror · Jan 13, 2014 · 7fe5e63 · 7fe5e63
2 parents 540cc75 + 0df49be
commit 7fe5e63
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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)" '