Merge branch 'sp/smart-http-failure'

* sp/smart-http-failure:
remote-curl: Fix warning after HTTP failure

diff --git a/remote-curl.c b/remote-curl.c
index b8cf45a7dd439b83c80bcf7a397e1b8e34c70f67..0aa4bfed309d6c439fac4ff2a0df6a468307e7bf 100644 (file)
--- 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;