Merge branch 'sp/fix-smart-http-deadlock-on-error' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 21:22:29 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 21:22:29 +0000 (14:22 -0700)
commit0a6369e0c946cc7408dddfcdea1d7914c4cfabfa
tree41d87d33d92caf5e647a9730f56f47c71a6d2c49
parent59dd30ee4377a868dd30cdc5151c8ebab1c0faa1
parentb4ee10f60fb46e0305968023c1ab0f072535b630
Merge branch 'sp/fix-smart-http-deadlock-on-error' into next

* sp/fix-smart-http-deadlock-on-error:
  smart-http: Don't deadlock on server failure
remote-curl.c