Merge branch 'sp/smart-http-failure' into next

* sp/smart-http-failure:
  remote-curl: Fix warning after HTTP failure
This commit is contained in:
Junio C Hamano 2011-10-06 15:41:53 -07:00
commit 02f99826d9

View file

@ -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;