summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-12-01 22:16:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-26 16:51:23 -0700
commitbc7c73e29cfb38232b5b6b1d1e8d59e7145a9860 (patch)
tree8eea4d7c1b62d892977fdf9e5429b133fb4145d1
parentbuiltin-fast-export: Only output a single parent per line (diff)
downloadtgif-bc7c73e29cfb38232b5b6b1d1e8d59e7145a9860.tar.xz
git-shell: accept "git foo" form
This is a backport of 0a47dc110e042b5bcc63dc94c8d517e67efe9306 to 'maint' to be included in 1.5.6.2 so that older server side can accept dashless form of request when clients are updated. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--shell.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/shell.c b/shell.c
index 9826109d5b..b27d01c9e4 100644
--- a/shell.c
+++ b/shell.c
@@ -7,6 +7,7 @@ static int do_generic_cmd(const char *me, char *arg)
{
const char *my_argv[4];
+ setup_path(NULL);
if (!arg || !(arg = sq_dequote(arg)))
die("bad argument");
if (prefixcmp(me, "git-"))
@@ -29,7 +30,6 @@ static int do_cvs_cmd(const char *me, char *arg)
die("git-cvsserver only handles server: %s", arg);
setup_path(NULL);
-
return execv_git_cmd(cvsserver_argv);
}
@@ -49,15 +49,24 @@ int main(int argc, char **argv)
char *prog;
struct commands *cmd;
+ /*
+ * Special hack to pretend to be a CVS server
+ */
if (argc == 2 && !strcmp(argv[1], "cvs server"))
argv--;
- /* We want to see "-c cmd args", and nothing else */
+
+ /*
+ * We do not accept anything but "-c" followed by "cmd arg",
+ * where "cmd" is a very limited subset of git commands.
+ */
else if (argc != 3 || strcmp(argv[1], "-c"))
die("What do you think I am? A shell?");
prog = argv[2];
- argv += 2;
- argc -= 2;
+ if (!strncmp(prog, "git", 3) && isspace(prog[3]))
+ /* Accept "git foo" as if the caller said "git-foo". */
+ prog[3] = '-';
+
for (cmd = cmd_list ; cmd->name ; cmd++) {
int len = strlen(cmd->name);
char *arg;