Revert "daemon: add upload-tar service."

This reverts parts of commit 74c0cc2 and part of commit 355f541.

Franck and Rene are working on a unified upload-archive which
would supersede this when done, so better not to get in their
way.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 35c3c4b61942a4bcf5484b0fccc08de17256c521..741f2c69bdace527c57b644ed072ead4dcb46201 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -135,12 +135,6 @@ upload-pack::
        disable it by setting `daemon.uploadpack` configuration
        item to `false`.
 
        disable it by setting `daemon.uploadpack` configuration
        item to `false`.
 

-upload-tar::
-       This serves `git-tar-tree --remote=repository` client.
-       It is not enabled by default, but a repository can
-       enable it by setting `daemon.uploadtar` configuration
-       item to `true`.
-

 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki

diff --git a/daemon.c b/daemon.c
index a4a08f39d513cc71e68c0c1d20eab75d27a5a86f..b14d8083bb14bd28a824c4417712842b1f70d829 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -22,6 +22,7 @@ static const char daemon_usage[] =
 "           [--timeout=n] [--init-timeout=n] [--strict-paths]\n"
 "           [--base-path=path] [--user-path | --user-path=path]\n"
 "           [--reuseaddr] [--detach] [--pid-file=file]\n"
 "           [--timeout=n] [--init-timeout=n] [--strict-paths]\n"
 "           [--base-path=path] [--user-path | --user-path=path]\n"
 "           [--reuseaddr] [--detach] [--pid-file=file]\n"

+"           [--[enable|disable|allow-override|forbid-override]=service]\n"

 "           [--user=user [[--group=group]] [directory...]";
 
 /* List of acceptable pathname prefixes */
 "           [--user=user [[--group=group]] [directory...]";
 
 /* List of acceptable pathname prefixes */


@@ -324,15 +325,8 @@ static int upload_pack(void)
        return -1;
 }
 
        return -1;
 }
 

-static int upload_tar(void)
-{
-       execl_git_cmd("upload-tar", ".", NULL);
-       return -1;
-}
-

 static struct daemon_service daemon_service[] = {
        { "upload-pack", "uploadpack", upload_pack, 1, 1 },
 static struct daemon_service daemon_service[] = {
        { "upload-pack", "uploadpack", upload_pack, 1, 1 },

-       { "upload-tar", "uploadtar", upload_tar, 0, 1 },

 };
 
 static void enable_service(const char *name, int ena) {
 };
 
 static void enable_service(const char *name, int ena) {