Merge branch 'ak/commit-only-allow-empty' into maint

diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index d043078da526275c3b1505297f5300cf1ad26a22..3fc484e8c3f8d910f02e409baf7bf1d5682b4f2f 100755 (executable)
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -175,10 +175,13 @@ test_expect_success 'negated exclude matches can override previous ones' '
        grep "^a.1" output
 '
 
-test_expect_success 'excluded directory does not override content patterns' '
+test_expect_success 'excluded directory overrides content patterns' '
 
        git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
-       grep "^one/a.1" output
+       if grep "^one/a.1" output
+       then
+               false
+       fi
 '
 
 test_expect_success 'negated directory doesn'\''t affect content patterns' '