Merge branch 'jc/gitignore-precedence' into maint

diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 8dc6939b9049baa32aca1200e36378e6e2296e9d..4ef5ed484c12a4509b9bc66f2cc41118f7254431 100755 (executable)
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -831,4 +831,14 @@ test_expect_success !MINGW,!CYGWIN 'correct handling of backslashes' '
        test_cmp err.expect err
 '
 
+test_expect_success 'info/exclude trumps core.excludesfile' '
+       echo >>global-excludes usually-ignored &&
+       echo >>.git/info/exclude "!usually-ignored" &&
+       >usually-ignored &&
+       echo "?? usually-ignored" >expect &&
+
+       git status --porcelain usually-ignored >actual &&
+       test_cmp expect actual
+'
+
 test_done