From: Tony Finch <dot@dotat.at>
Date: Wed, 31 Mar 2010 01:04:32 +0000 (+0100)
Subject: git-daemon: invoke 'git upload-pack' instead of 'git-upload-pack'
X-Git-Tag: userv/0.6.1~96
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=35b4c7158dd386490bd600a4c5b5448aa077bcbf

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

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