Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 23:30:11 +0000 (16:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 23:30:11 +0000 (16:30 -0700)
commit0a4139b5f283ef5e817afaafd9e7e2a149220cc4
treebb82d5f38b4677d5040ff0a7035f04366e12e4f2
parent452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e
parentb4ee10f60fb46e0305968023c1ab0f072535b630
Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint

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