aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Broes <erikbroes@ripe.net>2009-04-09 21:58:52 +0200
committerJunio C Hamano <gitster@pobox.com>2009-04-11 11:01:15 -0700
commit79f72b97633d1699f131e798bb9833339ba22f6a (patch)
tree104ce0ac58e941cbe160f7283920a103f3995e38
parente37347bba651f051998f23a3701b555f1a194557 (diff)
downloadgit-79f72b97633d1699f131e798bb9833339ba22f6a.tar.gz
git-79f72b97633d1699f131e798bb9833339ba22f6a.tar.xz
git-shell: Add 'git-upload-archive' to allowed commands.
This allows for example gitosis to allow use of 'git archive --remote' in a controlled environment. Signed-off-by: Erik Broes <erikbroes@ripe.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-shell.txt6
-rw-r--r--shell.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index 3f8d973af..0f3ad811c 100644
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -18,9 +18,9 @@ of server-side GIT commands implementing the pull/push functionality.
The commands can be executed only by the '-c' option; the shell is not
interactive.
-Currently, only three commands are permitted to be called, 'git-receive-pack'
-'git-upload-pack' with a single required argument or 'cvs server' (to invoke
-'git-cvsserver').
+Currently, only four commands are permitted to be called, 'git-receive-pack'
+'git-upload-pack' and 'git-upload-archive' with a single required argument, or
+'cvs server' (to invoke 'git-cvsserver').
Author
------
diff --git a/shell.c b/shell.c
index e3393690d..b968be79f 100644
--- a/shell.c
+++ b/shell.c
@@ -40,6 +40,7 @@ static struct commands {
} cmd_list[] = {
{ "git-receive-pack", do_generic_cmd },
{ "git-upload-pack", do_generic_cmd },
+ { "git-upload-archive", do_generic_cmd },
{ "cvs", do_cvs_cmd },
{ NULL },
};