Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint

diff --git a/upload-pack.c b/upload-pack.c
index 01de944a0a23f752364de51d7f5a5be6480575e8..433211a238cfee261e6e1f9e73d14df9178f004a 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -167,7 +167,9 @@ static void create_pack_file(void)
                if (!pollsize)
                        break;
 
-               ret = poll(pfd, pollsize, 1000 * keepalive);
+               ret = poll(pfd, pollsize,
+                       keepalive < 0 ? -1 : 1000 * keepalive);
+
                if (ret < 0) {
                        if (errno != EINTR) {
                                error("poll failed, resuming: %s",