about summary refs log tree commit diff
path: root/third_party/git/t/t0008-ignores.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t0008-ignores.sh')
-rwxr-xr-xthird_party/git/t/t0008-ignores.sh39
1 files changed, 16 insertions, 23 deletions
diff --git a/third_party/git/t/t0008-ignores.sh b/third_party/git/t/t0008-ignores.sh
index 370a389e5c5c..1744cee5e996 100755
--- a/third_party/git/t/t0008-ignores.sh
+++ b/third_party/git/t/t0008-ignores.sh
@@ -424,24 +424,9 @@ test_expect_success 'local ignore inside a sub-directory with --verbose' '
 	)
 '
 
-test_expect_success 'nested include of negated pattern' '
-	expect "" &&
-	test_check_ignore "a/b/one" 1
-'
-
-test_expect_success 'nested include of negated pattern with -q' '
-	expect "" &&
-	test_check_ignore "-q a/b/one" 1
-'
-
-test_expect_success 'nested include of negated pattern with -v' '
-	expect "a/b/.gitignore:8:!on*	a/b/one" &&
-	test_check_ignore "-v a/b/one" 0
-'
-
-test_expect_success 'nested include of negated pattern with -v -n' '
-	expect "a/b/.gitignore:8:!on*	a/b/one" &&
-	test_check_ignore "-v -n a/b/one" 0
+test_expect_success_multi 'nested include' \
+	'a/b/.gitignore:8:!on*	a/b/one' '
+	test_check_ignore "a/b/one"
 '
 
 ############################################################################
@@ -475,6 +460,7 @@ test_expect_success 'cd to ignored sub-directory' '
 	expect_from_stdin <<-\EOF &&
 		foo
 		twoooo
+		../one
 		seven
 		../../one
 	EOF
@@ -557,6 +543,7 @@ test_expect_success 'global ignore' '
 		globalthree
 		a/globalthree
 		a/per-repo
+		globaltwo
 	EOF
 	test_check_ignore "globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo"
 '
@@ -599,7 +586,17 @@ EOF
 cat <<-\EOF >expected-default
 	one
 	a/one
+	a/b/on
+	a/b/one
+	a/b/one one
+	a/b/one two
+	"a/b/one\"three"
+	a/b/two
 	a/b/twooo
+	globaltwo
+	a/globaltwo
+	a/b/globaltwo
+	b/globaltwo
 EOF
 cat <<-EOF >expected-verbose
 	.gitignore:1:one	one
@@ -699,12 +696,8 @@ cat <<-EOF >expected-all
 	$global_excludes:2:!globaltwo	../b/globaltwo
 	::	c/not-ignored
 EOF
-cat <<-EOF >expected-default
-../one
-one
-b/twooo
-EOF
 grep -v '^::	' expected-all >expected-verbose
+sed -e 's/.*	//' expected-verbose >expected-default
 
 broken_c_unquote stdin >stdin0