Merge branch 'rs/update-hook-optim' into maint

Code clean-up.

* rs/update-hook-optim:
  receive-pack: simplify run_update_post_hook()
This commit is contained in:
Junio C Hamano 2017-03-28 13:52:28 -07:00
Родитель fb0ab976c6 dce96c41f9
Коммит fd7c41ec97
1 изменённых файлов: 5 добавлений и 8 удалений

Просмотреть файл

@ -1125,25 +1125,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;