Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint
commitb8f7239058e6f7c8bb68bd4276ff797d83e03229
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:13 +0000 (19 14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:13 +0000 (19 14:05 -0700)
tree347c0e84382ea0a5e88b56a02746862d260bcb55
parent08fd8a055cd11291020bf8c6f83d27cdc55df419
parent6c71f8b0d3d39beffe050f92f33a25dc30dffca3
Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint

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