Merge branch 'et/spell-poll-infinite-with-minus-one-only' into jch
commit8529ef2f4d56cf1e7b913fbc046431dcfdf5afb5
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:34:07 +0000 (25 12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:34:07 +0000 (25 12:34 -0700)
treedee909dc3dc981556cd06a1b920ae840fa45128e
parent96217272b801d04dbb79d19eb5737ee433b27d7b
parent6c71f8b0d3d39beffe050f92f33a25dc30dffca3
Merge branch 'et/spell-poll-infinite-with-minus-one-only' into jch

* et/spell-poll-infinite-with-minus-one-only:
  upload-pack: keep poll(2)'s timeout to -1
upload-pack.c