diff options
author | Junio C Hamano <junkio@cox.net> | 2006-08-16 08:15:32 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-16 08:15:32 +0400 |
commit | c9c3470aec3a1d753ac1e5f21358f6374c1add95 (patch) | |
tree | 32cfcecc5dfb4491eb054d9576f0db50fe058bbf /connect.c | |
parent | 6f002f984f1d1ddfdae990582a423dc5263697ae (diff) | |
parent | 53e1a761be8d338cd957870bc1e48a8c15d7d2c0 (diff) |
Merge branch 'maint'
* maint:
finish_connect(): thinkofix
git-mv: succeed even if source is a prefix of destination
Solaris does not support C99 format strings before version 10
Diffstat (limited to 'connect.c')
-rw-r--r-- | connect.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -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; } |