summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-28 08:46:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-28 08:46:33 (GMT)
commit811428e5b1186b87263c921ce88bdc1de2a65ce6 (patch)
tree6655f8b4a21cc70120a9612dfa199f6da64a8acd
parentdf3dac3758e0b3e8178aff03fd0ceaf340735527 (diff)
parentf9acaeae880feb87ae52e719aab930bf1f3e8413 (diff)
downloadgit-811428e5b1186b87263c921ce88bdc1de2a65ce6.zip
git-811428e5b1186b87263c921ce88bdc1de2a65ce6.tar.gz
git-811428e5b1186b87263c921ce88bdc1de2a65ce6.tar.bz2
Merge branch 'gp/maint-cvsserver'
* gp/maint-cvsserver: git-cvsserver: allow regex metacharacters in CVSROOT
-rwxr-xr-xgit-cvsserver.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 2804106..13751db 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -408,7 +408,7 @@ sub req_Directory
$state->{localdir} = $data;
$state->{repository} = $repository;
$state->{path} = $repository;
- $state->{path} =~ s/^$state->{CVSROOT}\///;
+ $state->{path} =~ s/^\Q$state->{CVSROOT}\E\///;
$state->{module} = $1 if ($state->{path} =~ s/^(.*?)(\/|$)//);
$state->{path} .= "/" if ( $state->{path} =~ /\S/ );