diff options
| author | Tony Finch <dot@dotat.at> | 2010-03-31 02:04:32 +0100 |
|---|---|---|
| committer | Ian Jackson <ian@liberator.relativity.greenend.org.uk> | 2010-05-22 15:54:41 +0100 |
| commit | 35b4c7158dd386490bd600a4c5b5448aa077bcbf (patch) | |
| tree | fdff689cf771f3fd49af5f501d15dd92f53f98a6 /git-daemon | |
| parent | 4e0661bfb8297ab900f85c2288a20d0c6dc0b29f (diff) | |
| download | userv-utils-35b4c7158dd386490bd600a4c5b5448aa077bcbf.tar.gz | |
git-daemon: invoke 'git upload-pack' instead of 'git-upload-pack'
Diffstat (limited to 'git-daemon')
| -rwxr-xr-x | git-daemon/git-service | 2 | ||||
| -rw-r--r-- | git-daemon/git-upload-pack | 2 |
2 files changed, 3 insertions, 1 deletions
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 |