Merge branch 'ab/subtree-doc'

diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
index 1ddd226b7850dbeecba255e2b4f4164ce2ff8b67..9e2b29ede508e3d0822f5eb607db2ae4896611e6 100755 (executable)
--- 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)" '