Skip to content

Commit

Permalink
Revert "daemon: add upload-tar service."
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Junio C Hamano committed Sep 7, 2006
1 parent 355f541 commit d9edcbd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
6 changes: 0 additions & 6 deletions Documentation/git-daemon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>, YOSHIFUJI Hideaki
Expand Down
8 changes: 1 addition & 7 deletions daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit d9edcbd

Please sign in to comment.