undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git.c: make autocorrected aliases work

Browse Source 
help_unknown_cmd() is able to autocorrect a command to an alias, and not
only to internal or external commands. However, main() was not passing the
autocorrected command through handle_alias(), hence it failed if it was an
alias.

This commit makes the autocorrected command go through handle_alias(), once
handle_internal_command() and execv_dashed_external() have been tried. Since
this is done twice in main() now, moved that logic to a new run_argv()
function.

Also, print the same "Expansion of alias 'x' failed" message when the alias
was autocorrected, rather than a generic "Failed to run command 'x'".

Signed-off-by: Adeodato Simó <dato@net.com.org.es>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adeodato Simó 2009-01-04 18:16:01 +01:00 committed by Junio C Hamano
parent e89e2ed7c2
commit a907e1b6ec
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
git.c
View File

@ -416,12 +416,34 @@ static void execv_dashed_external(const char **argv)
strbuf_release(&cmd); strbuf_release(&cmd);
} }
static int run_argv(int *argcp, const char ***argv)
{
int done_alias = 0;
while (1) {
/* See if it's an internal command */
handle_internal_command(*argcp, *argv);
/* .. then try the external ones */
execv_dashed_external(*argv);
/* It could be an alias -- this works around the insanity
* of overriding "git log" with "git show" by having
* alias.log = show
*/
if (done_alias || !handle_alias(argcp, argv))
break;
done_alias = 1;
}
return done_alias;
}
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
const char *cmd = argv[0] && *argv[0] ? argv[0] : "git-help"; const char *cmd = argv[0] && *argv[0] ? argv[0] : "git-help";
char *slash = (char *)cmd + strlen(cmd); char *slash = (char *)cmd + strlen(cmd);
int done_alias = 0;
/* /*
* Take the basename of argv[0] as the command * Take the basename of argv[0] as the command
@ -479,31 +501,22 @@ int main(int argc, const char **argv)
setup_path(); setup_path();
while (1) { while (1) {
/* See if it's an internal command */ static int done_help = 0;
handle_internal_command(argc, argv); static int was_alias = 0;
was_alias = run_argv(&argc, &argv);
/* .. then try the external ones */ if (errno != ENOENT)
execv_dashed_external(argv);
/* It could be an alias -- this works around the insanity
* of overriding "git log" with "git show" by having
* alias.log = show
*/
if (done_alias || !handle_alias(&argc, &argv))
break; break;
done_alias = 1; if (was_alias) {
}
if (errno == ENOENT) {
if (done_alias) {
fprintf(stderr, "Expansion of alias '%s' failed; " fprintf(stderr, "Expansion of alias '%s' failed; "
"'%s' is not a git-command\n", "'%s' is not a git-command\n",
cmd, argv[0]); cmd, argv[0]);
exit(1); exit(1);
} }
argv[0] = help_unknown_cmd(cmd); if (!done_help) {
handle_internal_command(argc, argv); cmd = argv[0] = help_unknown_cmd(cmd);
execv_dashed_external(argv); done_help = 1;
} else
break;
} }
fprintf(stderr, "Failed to run command '%s': %s\n", fprintf(stderr, "Failed to run command '%s': %s\n",