mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-21 09:42:22 +02:00
Code

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

Browse Source 
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
This commit is contained in:
Junio C Hamano 2019-12-01 09:04:40 -08:00
commit 3ae8defaf9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
send-pack.c
View File

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