From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Thu, 18 Dec 2008 17:11:18 +0000 (+0100)
Subject: test overlapping ignore patterns
X-Git-Tag: v1.6.1-rc4~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=32738edfca29d819939196c65aecc1979ed23aa9;p=git.git

test overlapping ignore patterns

Add a test which checks that negated patterns such as "!foo.html" can
override previous patterns such as "*.html". This is documented
behaviour but had not been tested so far.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 8666946b0..85aef12a1 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -140,4 +140,10 @@ test_expect_success 'trailing slash in exclude forces directory match (2)' '
 
 '
 
+test_expect_success 'negated exclude matches can override previous ones' '
+
+	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
+	grep "^a.1" output
+'
+
 test_done