Commit 3ae8defa authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'jk/send-pack-remote-failure'

Error handling after "git push" finishes sending the packdata and
waits for the response to the remote side has been improved.

* jk/send-pack-remote-failure:
  send-pack: check remote ref status on pack-objects failure
parents aec3b2e2 ad7a4032
......@@ -565,8 +565,6 @@ int send_pack(struct send_pack_args *args,
if (need_pack_data && cmds_sent) {
if (pack_objects(out, remote_refs, extra_have, args) < 0) {
for (ref = remote_refs; ref; ref = ref->next)
ref->status = REF_STATUS_NONE;
if (args->stateless_rpc)
close(out);
if (git_connection_is_socket(conn))
......@@ -574,10 +572,12 @@ int send_pack(struct send_pack_args *args,
/*
* Do not even bother with the return value; we know we
* are failing, and just want the error() side effects.
* are failing, and just want the error() side effects,
* as well as marking refs with their remote status (if
* we get one).
*/
if (status_report)
receive_unpack_status(&reader);
receive_status(&reader, remote_refs);
if (use_sideband) {
close(demux.out);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment