Skip to content

Commit f172f33

Browse files
peffgitster
authored andcommitted
git: s/run_command/run_builtin/
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 02322e1 commit f172f33

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ struct cmd_struct {
219219
int option;
220220
};
221221

222-
static int run_command(struct cmd_struct *p, int argc, const char **argv)
222+
static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
223223
{
224224
int status;
225225
struct stat st;
@@ -384,7 +384,7 @@ static void handle_internal_command(int argc, const char **argv)
384384
struct cmd_struct *p = commands+i;
385385
if (strcmp(p->cmd, cmd))
386386
continue;
387-
exit(run_command(p, argc, argv));
387+
exit(run_builtin(p, argc, argv));
388388
}
389389
}
390390

0 commit comments

Comments
 (0)