kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

receive-pack: switch global variable 'commands' to a parameter 

Receive-pack is inconsistent in its usage of the 'commands'
variable; though it is setup as a global and accessed that way by
execute_commands(), report(), and run_receive_hook(), it is also
passed as a parameter to delete_only() and run_update_post_hook().

For consistency, make it local to cmd_receive_pack and pass it as a
parameter. As long as we're cleaning up, also make our use of the
names 'commands' and 'cmd' consistent.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jay Soffian 2010-04-19 18:08:30 -04:00 committed by Junio C Hamano
parent f78683f3a8
commit 5e1c71fd14
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
builtin-receive-pack.c
View File

@ -134,8 +134,6 @@ struct command {
char ref_name[FLEX_ARRAY]; /* more */ char ref_name[FLEX_ARRAY]; /* more */
}; };


static struct command *commands;

static const char pre_receive_hook[] = "hooks/pre-receive"; static const char pre_receive_hook[] = "hooks/pre-receive";
static const char post_receive_hook[] = "hooks/post-receive"; static const char post_receive_hook[] = "hooks/post-receive";


@ -188,7 +186,7 @@ static int copy_to_sideband(int in, int out, void *arg)
return 0; return 0;
} }


static int run_receive_hook(const char *hook_name) static int run_receive_hook(struct command *commands, const char *hook_name)
{ {
static char buf[sizeof(commands->old_sha1) * 2 + PATH_MAX + 4]; static char buf[sizeof(commands->old_sha1) * 2 + PATH_MAX + 4];
struct command *cmd; struct command *cmd;
@ -447,15 +445,15 @@ static const char *update(struct command *cmd)


static char update_post_hook[] = "hooks/post-update"; static char update_post_hook[] = "hooks/post-update";


static void run_update_post_hook(struct command *cmd) static void run_update_post_hook(struct command *commands)
{ {
struct command *cmd_p; struct command *cmd;
int argc; int argc;
const char **argv; const char **argv;
struct child_process proc; struct child_process proc;


for (argc = 0, cmd_p = cmd; cmd_p; cmd_p = cmd_p->next) { for (argc = 0, cmd = commands; cmd; cmd = cmd->next) {
if (cmd_p->error_string) if (cmd->error_string)
continue; continue;
argc++; argc++;
} }
@ -464,12 +462,12 @@ static void run_update_post_hook(struct command *cmd)
argv = xmalloc(sizeof(*argv) * (2 + argc)); argv = xmalloc(sizeof(*argv) * (2 + argc));
argv[0] = update_post_hook; argv[0] = update_post_hook;


for (argc = 1, cmd_p = cmd; cmd_p; cmd_p = cmd_p->next) { for (argc = 1, cmd = commands; cmd; cmd = cmd->next) {
char *p; char *p;
if (cmd_p->error_string) if (cmd->error_string)
continue; continue;
p = xmalloc(strlen(cmd_p->ref_name) + 1); p = xmalloc(strlen(cmd->ref_name) + 1);
strcpy(p, cmd_p->ref_name); strcpy(p, cmd->ref_name);
argv[argc] = p; argv[argc] = p;
argc++; argc++;
} }
@ -488,37 +486,32 @@ static void run_update_post_hook(struct command *cmd)
} }
} }


static void execute_commands(const char *unpacker_error) static void execute_commands(struct command *commands, const char *unpacker_error)
{ {
struct command *cmd = commands; struct command *cmd;
unsigned char sha1[20]; unsigned char sha1[20];


if (unpacker_error) { if (unpacker_error) {
while (cmd) { for (cmd = commands; cmd; cmd = cmd->next)
cmd->error_string = "n/a (unpacker error)"; cmd->error_string = "n/a (unpacker error)";
cmd = cmd->next;
}
return; return;
} }


if (run_receive_hook(pre_receive_hook)) { if (run_receive_hook(commands, pre_receive_hook)) {
while (cmd) { for (cmd = commands; cmd; cmd = cmd->next)
cmd->error_string = "pre-receive hook declined"; cmd->error_string = "pre-receive hook declined";
cmd = cmd->next;
}
return; return;
} }


head_name = resolve_ref("HEAD", sha1, 0, NULL); head_name = resolve_ref("HEAD", sha1, 0, NULL);


while (cmd) { for (cmd = commands; cmd; cmd = cmd->next)
cmd->error_string = update(cmd); cmd->error_string = update(cmd);
cmd = cmd->next;
}
} }


static void read_head_info(void) static struct command *read_head_info(void)
{ {
struct command *commands = NULL;
struct command **p = &commands; struct command **p = &commands;
for (;;) { for (;;) {
static char line[1000]; static char line[1000];
@ -557,6 +550,7 @@ static void read_head_info(void)
*p = cmd; *p = cmd;
p = &cmd->next; p = &cmd->next;
} }
return commands;
} }


static const char *parse_pack_header(struct pack_header *hdr) static const char *parse_pack_header(struct pack_header *hdr)
@ -643,7 +637,7 @@ static const char *unpack(void)
} }
} }


static void report(const char *unpack_status) static void report(struct command *commands, const char *unpack_status)
{ {
struct command *cmd; struct command *cmd;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
@ -667,12 +661,12 @@ static void report(const char *unpack_status)
strbuf_release(&buf); strbuf_release(&buf);
} }


static int delete_only(struct command *cmd) static int delete_only(struct command *commands)
{ {
while (cmd) { struct command *cmd;
for (cmd = commands; cmd; cmd = cmd->next) {
if (!is_null_sha1(cmd->new_sha1)) if (!is_null_sha1(cmd->new_sha1))
return 0; return 0;
cmd = cmd->next;
} }
return 1; return 1;
} }
@ -722,6 +716,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
int stateless_rpc = 0; int stateless_rpc = 0;
int i; int i;
char *dir = NULL; char *dir = NULL;
struct command *commands;


argv++; argv++;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
@ -772,18 +767,17 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
if (advertise_refs) if (advertise_refs)
return 0; return 0;


read_head_info(); if ((commands = read_head_info()) != NULL) {
if (commands) {
const char *unpack_status = NULL; const char *unpack_status = NULL;


if (!delete_only(commands)) if (!delete_only(commands))
unpack_status = unpack(); unpack_status = unpack();
execute_commands(unpack_status); execute_commands(commands, unpack_status);
if (pack_lockfile) if (pack_lockfile)
unlink_or_warn(pack_lockfile); unlink_or_warn(pack_lockfile);
if (report_status) if (report_status)
report(unpack_status); report(commands, unpack_status);
run_receive_hook(post_receive_hook); run_receive_hook(commands, post_receive_hook);
run_update_post_hook(commands); run_update_post_hook(commands);
if (auto_gc) { if (auto_gc) {
const char *argv_gc_auto[] = { const char *argv_gc_auto[] = {