Merge branch 'maint'

diff --git a/connect.c b/connect.c
index 4422a0d8d38c225c6c4716ce8ff826bc1acbd981..b9c222085ee1390c8f0c02f63304193fa78ce677 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -737,14 +737,9 @@ int git_connect(int fd[2], char *url, const char *prog)
 
 int finish_connect(pid_t pid)
 {
-       int ret;
-
-       for (;;) {
-               ret = waitpid(pid, NULL, 0);
-               if (!ret)
-                       break;
+       while (waitpid(pid, NULL, 0) < 0) {
                if (errno != EINTR)
-                       break;
+                       return -1;
        }
-       return ret;
+       return 0;
 }