git: s/run_command/run_builtin/
authorJeff King <peff@peff.net>
Wed, 28 Jan 2009 07:33:53 +0000 (02:33 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Jan 2009 21:16:30 +0000 (13:16 -0800)
There is a static function called run_command which
conflicts with the library function in run-command.c; this
isn't a problem currently, but prevents including
run-command.h in git.c.

This patch just renames the static function to something
more specific and non-conflicting.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git.c

diff --git a/git.c b/git.c
index 940a498962ceb06a1dba85547d61ad62bb81a499..40162952bab2c55f660ae907b8fd0ba26fdb9bda 100644 (file)
--- a/git.c
+++ b/git.c
@@ -219,7 +219,7 @@ struct cmd_struct {
        int option;
 };
 
-static int run_command(struct cmd_struct *p, int argc, const char **argv)
+static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 {
        int status;
        struct stat st;
@@ -384,7 +384,7 @@ static void handle_internal_command(int argc, const char **argv)
                struct cmd_struct *p = commands+i;
                if (strcmp(p->cmd, cmd))
                        continue;
-               exit(run_command(p, argc, argv));
+               exit(run_builtin(p, argc, argv));
        }
 }