Better handling of .git suffixes

1 files changed, 9 insertions, 5 deletions

diff --git a/git-daemon/git-service.in b/git-daemon/git-service.in
index 75e64d5..2b8aff3 100755
--- a/git-daemon/git-service.in
+++ b/git-daemon/git-service.in
@@ -26,11 +26,15 @@ fail "No user $ENV{USER} mapping for $uri" unless defined $serve_user;
 
 $serve_dir = "$ENV{HOME}/$serve_dir" unless $serve_dir =~ m|^/|;
 
-fail "Bad subdirectory $serve_repo" unless $serve_repo =~ m/$repo_regexp/o;
-fail "bad config - repo-regexp does not capture" unless defined $1;
-my $sani_repo= $1;
-
-my $dir = $serve_dir.(length $sani_repo ? "/$sani_repo" : '');
+if (length $serve_repo) {
+    my $inspect= $serve_repo;
+    $inspect =~ s,^/,,;
+    fail "Bad subdirectory $serve_repo" unless $inspect =~ m/$repo_regexp/o;
+    fail "bad config - repo-regexp does not capture" unless defined $1;
+    $serve_repo= "/$1";
+}
+
+my $dir = $serve_dir.$serve_repo;
 
 my $path = $check_export ? "$dir/git-daemon-export-ok" : $dir;
 fail "$! $path" unless -e $path;