update hook: redirect _both_ diagnostic lines to stderr upon tag failure

[git.git] / run-command.c

diff --git a/run-command.c b/run-command.c
index ca67ee9333e1f4125678fe607f44d75becc3cf7e..492ad3e64ce5d2435c029ab032f1221347f37c19 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "run-command.h"
-#include <sys/wait.h>
 #include "exec_cmd.h"
 
 int run_command_v_opt(int argc, const char **argv, int flags)
@@ -25,15 +24,15 @@ int run_command_v_opt(int argc, const char **argv, int flags)
        }
        for (;;) {
                int status, code;
-               int retval = waitpid(pid, &status, 0);
+               pid_t waiting = waitpid(pid, &status, 0);
 
-               if (retval < 0) {
+               if (waiting < 0) {
                        if (errno == EINTR)
                                continue;
-                       error("waitpid failed (%s)", strerror(retval));
+                       error("waitpid failed (%s)", strerror(errno));
                        return -ERR_RUN_COMMAND_WAITPID;
                }
-               if (retval != pid)
+               if (waiting != pid)
                        return -ERR_RUN_COMMAND_WAITPID_WRONG_PID;
                if (WIFSIGNALED(status))
                        return -ERR_RUN_COMMAND_WAITPID_SIGNAL;