diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-09-07 01:40:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-07 02:36:31 -0700 |
| commit | d9edcbd6061a392c1315ab6f3aedb9992a3c01b1 (patch) | |
| tree | 518e7aa2d2206def6be99d36a9b2e73cffb1613b | |
| parent | multi-service daemon: documentation (diff) | |
| download | tgif-d9edcbd6061a392c1315ab6f3aedb9992a3c01b1.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-daemon.txt | 6 | ||||
| -rw-r--r-- | daemon.c | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 35c3c4b619..741f2c69bd 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 @@ -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) { |