@matheusbsbs / matheus-bagliano / commits / d9edcbd606
Fork 0

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>

Junio C Hamano committed Sep 7, 2006 at 01:40 UTC d9edcbd6061a392c1315ab6f3aedb9992a3c01b1
2 files changed +1 -13
Documentation/git-daemon.txt
-6
@@ -135,12 +135,6 @@ upload-pack::
135 disable it by setting `daemon.uploadpack` configuration
136 item to `false`.
137
138 -upload-tar::
139 - This serves `git-tar-tree --remote=repository` client.
140 - It is not enabled by default, but a repository can
141 - enable it by setting `daemon.uploadtar` configuration
142 - item to `true`.
143 -
138 Author
139 ------
140 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki
daemon.c
+1 -7
@@ -22,6 +22,7 @@ static const char daemon_usage[] =
22 " [--timeout=n] [--init-timeout=n] [--strict-paths]\n"
23 " [--base-path=path] [--user-path | --user-path=path]\n"
24 " [--reuseaddr] [--detach] [--pid-file=file]\n"
25 +" [--[enable|disable|allow-override|forbid-override]=service]\n"
26 " [--user=user [[--group=group]] [directory...]";
27
28 /* List of acceptable pathname prefixes */
@@ -324,15 +325,8 @@ static int upload_pack(void)
325 return -1;
326 }
327
327 -static int upload_tar(void)
328 -{
329 - execl_git_cmd("upload-tar", ".", NULL);
330 - return -1;
331 -}
332 -
328 static struct daemon_service daemon_service[] = {
329 { "upload-pack", "uploadpack", upload_pack, 1, 1 },
335 - { "upload-tar", "uploadtar", upload_tar, 0, 1 },
330 };
331
332 static void enable_service(const char *name, int ena) {