summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-daemon.txt6
-rw-r--r--daemon.c8
2 files changed, 1 insertions, 13 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 35c3c4b..741f2c6 100644
--- 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`.
-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
diff --git a/daemon.c b/daemon.c
index a4a08f3..b14d808 100644
--- 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"
+" [--[enable|disable|allow-override|forbid-override]=service]\n"
" [--user=user [[--group=group]] [directory...]";
/* List of acceptable pathname prefixes */
@@ -324,15 +325,8 @@ static int upload_pack(void)
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 },
- { "upload-tar", "uploadtar", upload_tar, 0, 1 },
};
static void enable_service(const char *name, int ena) {