diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 17:33:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 17:33:29 (GMT) |
| commit | 9ddd68973a946213a4607d6610e8a2b7ef5b19c0 (patch) | |
| tree | eb35e3e9fbf656b63a59df3058be780394b5c263 /upload-pack.c | |
| parent | 6c1d42acae99ee0bbb9af8e91c5dca5d8fbb4f39 (diff) | |
| parent | 6c71f8b0d3d39beffe050f92f33a25dc30dffca3 (diff) | |
| download | git-9ddd68973a946213a4607d6610e8a2b7ef5b19c0.zip git-9ddd68973a946213a4607d6610e8a2b7ef5b19c0.tar.gz git-9ddd68973a946213a4607d6610e8a2b7ef5b19c0.tar.bz2 | |
Merge branch 'et/spell-poll-infinite-with-minus-one-only'
We used to pass -1000 to poll(2), expecting it to also mean "no
timeout", which should be spelled as -1.
* et/spell-poll-infinite-with-minus-one-only:
upload-pack: keep poll(2)'s timeout to -1
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index c9ea1d3..c789ec0 100644 --- 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", |