diff options
| -rw-r--r-- | lib/PublicInbox/Config.pm | 2 | ||||
| -rw-r--r-- | t/config.t | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 33c59ec7..b8d3c485 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -662,7 +662,7 @@ sub squote_maybe ($) { } my %re_map = ( '*' => '[^/]*?', '?' => '[^/]', - '/**' => '/.*', '**/' => '.*/', '/**/' => '/.*?', + '/**' => '/.*', '**/' => '.*/', '/**/' => '(?:/.*?/|/)', '[' => '[', ']' => ']', ',' => ',' ); sub glob2re ($) { @@ -296,8 +296,9 @@ is_deeply($glob2re->('\\\\{a,b}'), '\\\\\\\\(a|b)', 'fake escape brace'); is_deeply($glob2re->('**/foo'), '.*/foo', 'double asterisk start'); is_deeply($glob2re->('foo/**'), 'foo/.*', 'double asterisk end'); my $re = $glob2re->('a/**/b'); -is_deeply($re, 'a/.*?b', 'double asterisk middle'); +is_deeply($re, 'a(?:/.*?/|/)b', 'double asterisk middle'); like($_, qr!$re!, "a/**/b matches $_") for ('a/b', 'a/c/b', 'a/c/a/b'); +unlike($_, qr!$re!, "a/**/b doesn't match $_") for ('a/ab'); { my $w = ''; |