]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'et/spell-poll-infinite-with-minus-one-only'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:28 +0000 (10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:29 +0000 (10:33 -0700)
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

1  2 
upload-pack.c

diff --cc upload-pack.c
Simple merge