summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-02-10 13:02:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-10 13:02:52 -0800
commit800d1fb0ab4bc9c1f4cd13f7cb7d8851f23a3e50 (patch)
tree0eb8a11bfca412c437e803339307a05224d26e36
parentMerge branch 'jc/maint-reflog-bad-timestamp' into maint (diff)
parentgit-cvsserver: allow regex metacharacters in CVSROOT (diff)
downloadtgif-800d1fb0ab4bc9c1f4cd13f7cb7d8851f23a3e50.tar.xz
Merge branch 'gp/maint-cvsserver' into maint
* 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 6dc45f5d45..046f5578a1 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -388,7 +388,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/ );