Merge branch 'et/spell-poll-infinite-with-minus-one-only'
commit9ddd68973a946213a4607d6610e8a2b7ef5b19c0
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:28 +0000 (11 10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:29 +0000 (11 10:33 -0700)
treeeb35e3e9fbf656b63a59df3058be780394b5c263
parent6c1d42acae99ee0bbb9af8e91c5dca5d8fbb4f39
parent6c71f8b0d3d39beffe050f92f33a25dc30dffca3
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
upload-pack.c