Merge branch 'rs/merge-tree-simplify'

diff --git a/upload-pack.c b/upload-pack.c
index c9ea1d3be668f9beeac408dfdf5ceea90c4a6ca8..c789ec00507696b4e52b081b66cc0e7c8cba42f9 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -166,7 +166,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",