diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-12 19:34:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-12 19:34:27 (GMT) |
| commit | 7ed72d1813e570f21259f3576fde0cc62b6de888 (patch) | |
| tree | b62664bf5b94af831608842252964090411cfb55 | |
| parent | a99c247c5380b83477e7f6ab4ba7b5488a49f28a (diff) | |
| parent | 6cdf0223fe4a9ccae543fece8b5e78a626ccdf89 (diff) | |
| download | git-7ed72d1813e570f21259f3576fde0cc62b6de888.zip git-7ed72d1813e570f21259f3576fde0cc62b6de888.tar.gz git-7ed72d1813e570f21259f3576fde0cc62b6de888.tar.bz2 | |
Merge branch 'sp/smart-http-failure'
* sp/smart-http-failure:
remote-curl: Fix warning after HTTP failure
| -rw-r--r-- | remote-curl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/remote-curl.c b/remote-curl.c index b8cf45a..0aa4bfe 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -573,7 +573,14 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads) close(client.in); client.in = -1; - strbuf_read(&rpc->result, client.out, 0); + if (!err) { + strbuf_read(&rpc->result, client.out, 0); + } else { + char buf[4096]; + for (;;) + if (xread(client.out, buf, sizeof(buf)) <= 0) + break; + } close(client.out); client.out = -1; |