From 3f784a4dcbe270a1f48b23177917a1832a777d1c Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Thu, 2 Jan 2014 17:15:44 +0100 Subject: [PATCH] git.c: consistently use the term "builtin" instead of "internal command" Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano --- Documentation/technical/api-builtin.txt | 2 +- git.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt index f3c1357b7c..150a02a558 100644 --- a/Documentation/technical/api-builtin.txt +++ b/Documentation/technical/api-builtin.txt @@ -14,7 +14,7 @@ Git: . Add the external declaration for the function to `builtin.h`. -. Add the command to `commands[]` table in `handle_internal_command()`, +. Add the command to `commands[]` table in `handle_builtin()`, defined in `git.c`. The entry should look like: { "foo", cmd_foo, }, diff --git a/git.c b/git.c index 3799514ccb..89ab5d7421 100644 --- a/git.c +++ b/git.c @@ -332,7 +332,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) return 0; } -static void handle_internal_command(int argc, const char **argv) +static void handle_builtin(int argc, const char **argv) { const char *cmd = argv[0]; static struct cmd_struct commands[] = { @@ -517,8 +517,8 @@ 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); + /* See if it's a builtin */ + handle_builtin(*argcp, *argv); /* .. then try the external ones */ execv_dashed_external(*argv); @@ -563,14 +563,14 @@ int main(int argc, char **av) * - cannot execute it externally (since it would just do * the same thing over again) * - * So we just directly call the internal command handler, and - * die if that one cannot handle it. + * So we just directly call the builtin handler, and die if + * that one cannot handle it. */ if (starts_with(cmd, "git-")) { cmd += 4; argv[0] = cmd; - handle_internal_command(argc, argv); - die("cannot handle %s internally", cmd); + handle_builtin(argc, argv); + die("cannot handle %s as a builtin", cmd); } /* Look for flags.. */ -- 2.11.4.GIT