mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
Merge branch 'maint-1.5.4' into maint-1.5.5
* maint-1.5.4: GIT 1.5.4.6 git-shell: accept "git foo" form Conflicts: GIT-VERSION-GEN RelNotes
This commit is contained in:
commit
53b22a9e45
43
Documentation/RelNotes-1.5.4.6.txt
Normal file
43
Documentation/RelNotes-1.5.4.6.txt
Normal file
|
@ -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.
|
||||||
|
|
17
shell.c
17
shell.c
|
@ -7,6 +7,7 @@ static int do_generic_cmd(const char *me, char *arg)
|
||||||
{
|
{
|
||||||
const char *my_argv[4];
|
const char *my_argv[4];
|
||||||
|
|
||||||
|
setup_path(NULL);
|
||||||
if (!arg || !(arg = sq_dequote(arg)))
|
if (!arg || !(arg = sq_dequote(arg)))
|
||||||
die("bad argument");
|
die("bad argument");
|
||||||
if (prefixcmp(me, "git-"))
|
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);
|
die("git-cvsserver only handles server: %s", arg);
|
||||||
|
|
||||||
setup_path(NULL);
|
setup_path(NULL);
|
||||||
|
|
||||||
return execv_git_cmd(cvsserver_argv);
|
return execv_git_cmd(cvsserver_argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,15 +49,24 @@ int main(int argc, char **argv)
|
||||||
char *prog;
|
char *prog;
|
||||||
struct commands *cmd;
|
struct commands *cmd;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Special hack to pretend to be a CVS server
|
||||||
|
*/
|
||||||
if (argc == 2 && !strcmp(argv[1], "cvs server"))
|
if (argc == 2 && !strcmp(argv[1], "cvs server"))
|
||||||
argv--;
|
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"))
|
else if (argc != 3 || strcmp(argv[1], "-c"))
|
||||||
die("What do you think I am? A shell?");
|
die("What do you think I am? A shell?");
|
||||||
|
|
||||||
prog = argv[2];
|
prog = argv[2];
|
||||||
argv += 2;
|
if (!strncmp(prog, "git", 3) && isspace(prog[3]))
|
||||||
argc -= 2;
|
/* Accept "git foo" as if the caller said "git-foo". */
|
||||||
|
prog[3] = '-';
|
||||||
|
|
||||||
for (cmd = cmd_list ; cmd->name ; cmd++) {
|
for (cmd = cmd_list ; cmd->name ; cmd++) {
|
||||||
int len = strlen(cmd->name);
|
int len = strlen(cmd->name);
|
||||||
char *arg;
|
char *arg;
|
||||||
|
|
Loading…
Reference in a new issue