undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

receive-pack: remove unnecessary run_status report

Browse Source 
The function run_status was used to report failures after a hook was run.
By now, the only thing that the function itself reported was the exit code
of the hook (if it was non-zero). But this is redundant because it can be
expected that the hook itself will have reported a suitable error.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2009-07-04 21:26:43 +02:00 committed by Junio C Hamano
parent c024beb56d
commit 90e41a89ca
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin-receive-pack.c
View File

@ -123,13 +123,6 @@ 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";
static int run_status(int code, const char *cmd_name)
{
if (code > 0)
error("%s exited with error code %d", cmd_name, code);
return code;
}
static int run_receive_hook(const char *hook_name) static int run_receive_hook(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];
@ -156,7 +149,7 @@ static int run_receive_hook(const char *hook_name)
code = start_command(&proc); code = start_command(&proc);
if (code) if (code)
return run_status(code, hook_name); return code;
for (cmd = commands; cmd; cmd = cmd->next) { for (cmd = commands; cmd; cmd = cmd->next) {
if (!cmd->error_string) { if (!cmd->error_string) {
size_t n = snprintf(buf, sizeof(buf), "%s %s %s\n", size_t n = snprintf(buf, sizeof(buf), "%s %s %s\n",
@ -168,7 +161,7 @@ static int run_receive_hook(const char *hook_name)
} }
} }
close(proc.in); close(proc.in);
return run_status(finish_command(&proc), hook_name); return finish_command(&proc);
} }
static int run_update_hook(struct command *cmd) static int run_update_hook(struct command *cmd)
@ -185,9 +178,8 @@ static int run_update_hook(struct command *cmd)
argv[3] = sha1_to_hex(cmd->new_sha1); argv[3] = sha1_to_hex(cmd->new_sha1);
argv[4] = NULL; argv[4] = NULL;
return run_status(run_command_v_opt(argv, RUN_COMMAND_NO_STDIN | return run_command_v_opt(argv, RUN_COMMAND_NO_STDIN |
RUN_COMMAND_STDOUT_TO_STDERR), RUN_COMMAND_STDOUT_TO_STDERR);
update_hook);
} }
static int is_ref_checked_out(const char *ref) static int is_ref_checked_out(const char *ref)
@ -401,7 +393,6 @@ static void run_update_post_hook(struct command *cmd)
argv[argc] = NULL; argv[argc] = NULL;
status = run_command_v_opt(argv, RUN_COMMAND_NO_STDIN status = run_command_v_opt(argv, RUN_COMMAND_NO_STDIN
| RUN_COMMAND_STDOUT_TO_STDERR); | RUN_COMMAND_STDOUT_TO_STDERR);
run_status(status, update_post_hook);
} }
static void execute_commands(const char *unpacker_error) static void execute_commands(const char *unpacker_error)
@ -519,7 +510,6 @@ static const char *unpack(void)
code = run_command_v_opt(unpacker, RUN_GIT_CMD); code = run_command_v_opt(unpacker, RUN_GIT_CMD);
if (!code) if (!code)
return NULL; return NULL;
run_status(code, unpacker[0]);
return "unpack-objects abnormal exit"; return "unpack-objects abnormal exit";
} else { } else {
const char *keeper[7]; const char *keeper[7];
@ -545,7 +535,6 @@ static const char *unpack(void)
ip.git_cmd = 1; ip.git_cmd = 1;
status = start_command(&ip); status = start_command(&ip);
if (status) { if (status) {
run_status(status, keeper[0]);
return "index-pack fork failed"; return "index-pack fork failed";
} }
pack_lockfile = index_pack_lockfile(ip.out); pack_lockfile = index_pack_lockfile(ip.out);
@ -555,7 +544,6 @@ static const char *unpack(void)
reprepare_packed_git(); reprepare_packed_git();
return NULL; return NULL;
} }
run_status(status, keeper[0]);
return "index-pack abnormal exit"; return "index-pack abnormal exit";
} }
} }