development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'as/autocorrect-alias'

Browse source 
* as/autocorrect-alias:
  git.c: make autocorrected aliases work
This commit is contained in:
Junio C Hamano 2009-01-17 23:05:34 -08:00
parent 39d743864b a907e1b6ec
commit 5786f4fac7
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",