receive-pack: simplify run_update_post_hook()

Instead of counting the arguments to see if there are any and then
building the full command use a single loop and add the hook command
just before the first argument.  This reduces duplication and overall
code size.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 011db00d31709408a21b97abfb5742b97b54238d..a5279e9df8739efa3665a158fe0667c86a26d209 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1118,25 +1118,22 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 static void run_update_post_hook(struct command *commands)
 {
        struct command *cmd;
 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");
        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;
 
                return;
 

-       argv_array_push(&proc.args, hook);

        for (cmd = commands; cmd; cmd = cmd->next) {
                if (cmd->error_string || cmd->did_not_exist)
                        continue;
        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);
        }
                argv_array_push(&proc.args, cmd->ref_name);
        }

+       if (!proc.args.argc)
+               return;

 
        proc.no_stdin = 1;
        proc.stdout_to_stderr = 1;
 
        proc.no_stdin = 1;
        proc.stdout_to_stderr = 1;