global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 11:10:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into next

Browse Source 
* js/maint-send-pack-stateless-rpc-deadlock-fix:
  send-pack: unbreak push over stateless rpc
This commit is contained in:
Junio C Hamano
2011-05-05 13:55:53 -07:00
parent 76e37e21d4 80b5b69855
commit 3f4ffb9caa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/send-pack.c
View File

@@ -101,7 +101,6 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
free(buf);
close(po.out);
po.out = -1;
close(fd);
}
if (finish_command(&po))
@@ -343,6 +342,8 @@ int send_pack(struct send_pack_args *args,
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 (use_sideband)
finish_async(&demux);
return -1;