git-daemon: invoke 'git upload-pack' instead of 'git-upload-pack'

diff --git a/git-daemon/git-service b/git-daemon/git-service
index f848db8b8bf35e2f5bf1a2c5b7457f35ede2f5de..9661434cc72d2d258cb04679e772723df7f7a30d 100755 (executable)
--- a/git-daemon/git-service
+++ b/git-daemon/git-service
@@ -33,7 +33,7 @@ $path = $check_export ? "$dir/git-daemon-export-ok" : $dir;
 fail "$! $path" unless -e $path;
 syslog 'notice', "$client $dir";
 
 fail "$! $path" unless -e $path;
 syslog 'notice', "$client $dir";
 

-my @cmd = ($service, '--strict', '--timeout=30', $dir);
+my @cmd = ($service =~ m|^(git)-(.*)$|, '--strict', '--timeout=30', $dir);

 no warnings; # suppress errors to stderr
 exec @cmd or fail "exec $service: $!";
 
 no warnings; # suppress errors to stderr
 exec @cmd or fail "exec $service: $!";
 

diff --git a/git-daemon/git-upload-pack b/git-daemon/git-upload-pack
index 1cba4648ee7f411a7416ad72780ba83d974efe6e..3169ccb5743ae6503decbf1e20ad82a4e31cc201 100644 (file)
--- a/git-daemon/git-upload-pack
+++ b/git-daemon/git-upload-pack
@@ -11,3 +11,5 @@ if ( grep service-user-shell /etc/shells
        errors-to-syslog daemon error
        execute /usr/local/lib/userv/git-service /etc/userv/git-urlmap .userv/git-urlmap
 fi
        errors-to-syslog daemon error
        execute /usr/local/lib/userv/git-service /etc/userv/git-urlmap .userv/git-urlmap
 fi

+
+# end