From 35b4c7158dd386490bd600a4c5b5448aa077bcbf Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Wed, 31 Mar 2010 02:04:32 +0100 Subject: [PATCH] git-daemon: invoke 'git upload-pack' instead of 'git-upload-pack' --- git-daemon/git-service | 2 +- git-daemon/git-upload-pack | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/git-daemon/git-service b/git-daemon/git-service index f848db8..9661434 100755 --- 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"; -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: $!"; diff --git a/git-daemon/git-upload-pack b/git-daemon/git-upload-pack index 1cba464..3169ccb 100644 --- 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 + +# end -- 2.11.0