summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-28 00:46:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-28 00:46:33 -0800
commit811428e5b1186b87263c921ce88bdc1de2a65ce6 (patch)
tree6655f8b4a21cc70120a9612dfa199f6da64a8acd
parenttests: update tests that used to fail (diff)
parentgit-cvsserver: allow regex metacharacters in CVSROOT (diff)
downloadtgif-811428e5b1186b87263c921ce88bdc1de2a65ce6.tar.xz
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 28041060c8..13751db882 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/ );