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

Merge branch 'rs/update-hook-optim'

Browse Source 
Code clean-up.

* rs/update-hook-optim:
  receive-pack: simplify run_update_post_hook()
This commit is contained in:
Junio C Hamano 2017-03-24 13:07:37 -07:00
commit 8b47c5de96
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/receive-pack.c
View File

@ -1128,25 +1128,22 @@ static const char *update(struct command *cmd, struct shallow_info *si)
static void run_update_post_hook(struct command *commands) static void run_update_post_hook(struct command *commands)
{ {
struct command *cmd; struct command *cmd;
int argc;
struct child_process proc = CHILD_PROCESS_INIT; struct child_process proc = CHILD_PROCESS_INIT;
const char *hook; const char *hook;
hook = find_hook("post-update"); hook = find_hook("post-update");
for (argc = 0, cmd = commands; cmd; cmd = cmd->next) { if (!hook)
if (cmd->error_string || cmd->did_not_exist)
continue;
argc++;
}
if (!argc || !hook)
return; return;
argv_array_push(&proc.args, hook);
for (cmd = commands; cmd; cmd = cmd->next) { for (cmd = commands; cmd; cmd = cmd->next) {
if (cmd->error_string || cmd->did_not_exist) if (cmd->error_string || cmd->did_not_exist)
continue; continue;
if (!proc.args.argc)
argv_array_push(&proc.args, hook);
argv_array_push(&proc.args, cmd->ref_name); argv_array_push(&proc.args, cmd->ref_name);
} }
if (!proc.args.argc)
return;
proc.no_stdin = 1; proc.no_stdin = 1;
proc.stdout_to_stderr = 1; proc.stdout_to_stderr = 1;