From bc7c73e29cfb38232b5b6b1d1e8d59e7145a9860 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 1 Dec 2007 22:16:19 -0800 Subject: [PATCH 1/3] 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 --- shell.c | 17 +++++++++++++---- 1 file 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; From 872354dcb3ce5f34f7ddb12d2c89d26a1ea4daf0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Jun 2008 17:11:21 -0700 Subject: [PATCH 2/3] GIT 1.5.4.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.4.6.txt | 43 ++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.5.4.6.txt diff --git a/Documentation/RelNotes-1.5.4.6.txt b/Documentation/RelNotes-1.5.4.6.txt new file mode 100644 index 0000000000..3e3c3e55a3 --- /dev/null +++ b/Documentation/RelNotes-1.5.4.6.txt @@ -0,0 +1,43 @@ +GIT v1.5.4.6 Release Notes +========================== + +I personally do not think there is any reason anybody should want to +run v1.5.4.X series these days, because 'master' version is always +more stable than any tagged released version of git. + +This is primarily to futureproof "git-shell" to accept requests +without a dash between "git" and subcommand name (e.g. "git +upload-pack") which the newer client will start to make sometime in +the future. + +Fixes since v1.5.4.5 +-------------------- + + * Command line option "-n" to "git-repack" was not correctly parsed. + + * Error messages from "git-apply" when the patchfile cannot be opened + have been improved. + + * Error messages from "git-bisect" when given nonsense revisions have + been improved. + + * reflog syntax that uses time e.g. "HEAD@{10 seconds ago}:path" did not + stop parsing at the closing "}". + + * "git rev-parse --symbolic-full-name ^master^2" printed solitary "^", + but it should print nothing. + + * "git apply" did not enforce "match at the beginning" correctly. + + * a path specification "a/b" in .gitattributes file should not match + "sub/a/b", but it did. + + * "git log --date-order --topo-order" did not override the earlier + date-order with topo-order as expected. + + * "git fast-export" did not export octopus merges correctly. + + * "git archive --prefix=$path/" mishandled gitattributes. + +As usual, it also comes with many documentation fixes and clarifications. + diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 85747e000a..94da67267c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.4.5.GIT +DEF_VER=v1.5.4.6.GIT LF=' ' diff --git a/RelNotes b/RelNotes index e13dbd4f9f..b9aa240526 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.4.5.txt \ No newline at end of file +Documentation/RelNotes-1.5.4.6.txt \ No newline at end of file From 006f31d77f3dd5f813557c2839b39b2aaa22b925 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Jun 2008 17:16:50 -0700 Subject: [PATCH 3/3] GIT 1.5.5.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.5.5.txt | 11 +++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.5.5.5.txt diff --git a/Documentation/RelNotes-1.5.5.5.txt b/Documentation/RelNotes-1.5.5.5.txt new file mode 100644 index 0000000000..30fa3615c7 --- /dev/null +++ b/Documentation/RelNotes-1.5.5.5.txt @@ -0,0 +1,11 @@ +GIT v1.5.5.5 Release Notes +========================== + +I personally do not think there is any reason anybody should want to +run v1.5.5.X series these days, because 'master' version is always +more stable than any tagged released version of git. + +This is primarily to futureproof "git-shell" to accept requests +without a dash between "git" and subcommand name (e.g. "git +upload-pack") which the newer client will start to make sometime in +the future. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 98d650aa62..af9d78daea 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.5.4.GIT +DEF_VER=v1.5.5.5.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 1b9812afe7..61a6d5cf29 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.5.4.txt \ No newline at end of file +Documentation/RelNotes-1.5.5.5.txt \ No newline at end of file