Skip to content

Commit

Permalink
Merge branch 'rs/update-hook-optim'
Browse files Browse the repository at this point in the history
Code clean-up.

* rs/update-hook-optim:
  receive-pack: simplify run_update_post_hook()
  • Loading branch information
gitster committed Mar 24, 2017
2 parents bedbeb1 + dce96c4 commit 8b47c5d
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions builtin/receive-pack.c
Expand Up @@ -1128,25 +1128,22 @@ static const char *update(struct command *cmd, struct shallow_info *si)
static void run_update_post_hook(struct command *commands)
{
struct command *cmd;
int argc;
struct child_process proc = CHILD_PROCESS_INIT;
const char *hook;

hook = find_hook("post-update");
for (argc = 0, cmd = commands; cmd; cmd = cmd->next) {
if (cmd->error_string || cmd->did_not_exist)
continue;
argc++;
}
if (!argc || !hook)
if (!hook)
return;

argv_array_push(&proc.args, hook);
for (cmd = commands; cmd; cmd = cmd->next) {
if (cmd->error_string || cmd->did_not_exist)
continue;
if (!proc.args.argc)
argv_array_push(&proc.args, hook);
argv_array_push(&proc.args, cmd->ref_name);
}
if (!proc.args.argc)
return;

proc.no_stdin = 1;
proc.stdout_to_stderr = 1;
Expand Down

0 comments on commit 8b47c5d

Please sign in to comment.