diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:19 (GMT) |
| commit | 25e4da89edc5339019f0d7c29a21ef4e08cccf24 (patch) | |
| tree | 9e1782553ba16f42b8f08c79582f9639a8cab6f6 /t/t3070-wildmatch.sh | |
| parent | 8c758f9a67a265ae51beddfd9895d48a42c2af13 (diff) | |
| parent | e5bbe09e88545cd1a3bcf2b157f020f92e0b5def (diff) | |
| download | git-25e4da89edc5339019f0d7c29a21ef4e08cccf24.zip git-25e4da89edc5339019f0d7c29a21ef4e08cccf24.tar.gz git-25e4da89edc5339019f0d7c29a21ef4e08cccf24.tar.bz2 | |
Merge branch 'nd/wildmatch-double-asterisk'
A pattern with '**' that does not have a slash on either side used
to be an invalid one, but the code now treats such double-asterisks
the same way as two normal asterisks that happen to be adjacent to
each other.
* nd/wildmatch-double-asterisk:
wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode
Diffstat (limited to 't/t3070-wildmatch.sh')
| -rwxr-xr-x | t/t3070-wildmatch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh index 46aca0a..891d4d7 100755 --- a/t/t3070-wildmatch.sh +++ b/t/t3070-wildmatch.sh @@ -237,7 +237,7 @@ match 0 0 0 0 foobar 'foo\*bar' match 1 1 1 1 'f\oo' 'f\\oo' match 1 1 1 1 ball '*[al]?' match 0 0 0 0 ten '[ten]' -match 0 0 1 1 ten '**[!te]' +match 1 1 1 1 ten '**[!te]' match 0 0 0 0 ten '**[!ten]' match 1 1 1 1 ten 't[a-g]n' match 0 0 0 0 ten 't[!a-g]n' @@ -253,7 +253,7 @@ match 1 1 1 1 ']' ']' # Extended slash-matching features match 0 0 1 1 'foo/baz/bar' 'foo*bar' match 0 0 1 1 'foo/baz/bar' 'foo**bar' -match 0 0 1 1 'foobazbar' 'foo**bar' +match 1 1 1 1 'foobazbar' 'foo**bar' match 1 1 1 1 'foo/baz/bar' 'foo/**/bar' match 1 1 0 0 'foo/baz/bar' 'foo/**/**/bar' match 1 1 1 1 'foo/b/a/z/bar' 'foo/**/bar' |