diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2011-10-04 16:20:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-04 19:11:50 -0700 |
| commit | 6cdf0223fe4a9ccae543fece8b5e78a626ccdf89 (patch) | |
| tree | 02358dc60d30c071f5a7132425fd2465bce0444f | |
| parent | ec014eac0e9e6f30cbbca616090fa2ecf74797e7 (diff) | |
| download | git-6cdf0223fe4a9ccae543fece8b5e78a626ccdf89.tar.gz | |
remote-curl: Fix warning after HTTP failure
If the HTTP connection is broken in the middle of a fetch or clone
body, the client presented a useless error message due to part of
the upload-pack->remote-curl pkt-line protocol leaking out of the
helper as the helper's "fetch result":
error: RPC failed; result=18, HTTP code = 200
fatal: The remote end hung up unexpectedly
fatal: early EOF
fatal: unpack-objects failed
warning: https unexpectedly said: '0000'
Instead when the HTTP RPC fails discard all remaining data from
upload-pack and report nothing to the transport helper. Errors
were already sent to stderr.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 775d614303..d9abbf5f75 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -575,7 +575,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; |