summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:37 (GMT)
commit5fd73da391dca25c9022b51dbbc450e321a00e40 (patch)
treea02f756e5ad15c9b33a905bf244e08405e71ba96
parent2f4af84578ab3302ba188a86e75743cafc23d300 (diff)
parentd8604c747b2c9c2b61f1257577c2939e5b07c664 (diff)
downloadgit-5fd73da391dca25c9022b51dbbc450e321a00e40.zip
git-5fd73da391dca25c9022b51dbbc450e321a00e40.tar.gz
git-5fd73da391dca25c9022b51dbbc450e321a00e40.tar.bz2
Merge branch 'ab/wildmatch-glob-slash-test'
A new test to show the interaction between the pattern [^a-z] (which matches '/') and a slash in a path has been added. The pattern should not match the slash with "pathmatch", but should with "wildmatch". * ab/wildmatch-glob-slash-test: wildmatch test: cover a blind spot in "/" matching
-rwxr-xr-xt/t3070-wildmatch.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 7ca69f4..8fd70d3 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -82,6 +82,7 @@ match 1 0 'foo/bar' 'foo/**/bar'
match 1 0 'foo/bar' 'foo/**/**/bar'
match 0 0 'foo/bar' 'foo?bar'
match 0 0 'foo/bar' 'foo[/]bar'
+match 0 0 'foo/bar' 'foo[^a-z]bar'
match 0 0 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
match 1 1 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
match 1 0 'foo' '**/foo'
@@ -225,6 +226,7 @@ pathmatch 0 foo/bba/arr 'foo/*z'
pathmatch 0 foo/bba/arr 'foo/**z'
pathmatch 1 foo/bar 'foo?bar'
pathmatch 1 foo/bar 'foo[/]bar'
+pathmatch 1 foo/bar 'foo[^a-z]bar'
pathmatch 0 foo '*/*/*'
pathmatch 0 foo/bar '*/*/*'
pathmatch 1 foo/bba/arr '*/*/*'