git-merge: Exit with code 2 if no strategy was able to handle the merge.

[git.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index d788167..91b9656 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -466,8 +466,14 @@ static int socksetup(int port, int **socklist_p)
                return 0;
        }
 
+       if (listen(sockfd, 5) < 0) {
+               close(sockfd);
+               return 0;
+       }
+
        *socklist_p = xmalloc(sizeof(int));
        **socklist_p = sockfd;
+       return 1;
 }
 
 #endif