Merge branch 'bk/maint-cvsexportcommit'

[git.git] / send-pack.c

diff --git a/send-pack.c b/send-pack.c
index 25053d2c2f7daa9aa392693a892db7e80c8b6469..5e127a1b7b33bdc9aaafc80873c5c987573566bd 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -384,7 +384,7 @@ int main(int argc, char **argv)
        char *dest = NULL;
        char **heads = NULL;
        int fd[2], ret;
-       pid_t pid;
+       struct child_process *conn;
        char *remote_name = NULL;
        struct remote *remote = NULL;
 
@@ -452,12 +452,10 @@ int main(int argc, char **argv)
                }
        }
 
-       pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
-       if (pid < 0)
-               return 1;
+       conn = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
        ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
        close(fd[0]);
        close(fd[1]);
-       ret |= finish_connect(pid);
+       ret |= finish_connect(conn);
        return !!ret;
 }