Merge with master to pick up gitk updates.

diff --git a/daemon.c b/daemon.c
index b7d60918ebab7816d8711b927aeae7dfab32fd2e..932d908bad3587b8ae7868112d587eaca775a303 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -294,8 +294,11 @@ static int serve(int port)
                fds = fds_init;
                
                if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 0) {
-                       error("select failed, resuming: %s", strerror(errno));
-                       sleep(1);
+                       if (errno != EINTR) {
+                               error("select failed, resuming: %s",
+                                     strerror(errno));
+                               sleep(1);
+                       }
                        continue;
                }