undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* js/maint-1.6.6-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:46:36 -07:00
commit 80b5b69855
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-send-pack.c
View File

@ -98,7 +98,6 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
free(buf); free(buf);
close(po.out); close(po.out);
po.out = -1; po.out = -1;
close(fd);
} }
if (finish_command(&po)) if (finish_command(&po))
@ -340,6 +339,8 @@ int send_pack(struct send_pack_args *args,
if (pack_objects(out, remote_refs, extra_have, args) < 0) { if (pack_objects(out, remote_refs, extra_have, args) < 0) {
for (ref = remote_refs; ref; ref = ref->next) for (ref = remote_refs; ref; ref = ref->next)
ref->status = REF_STATUS_NONE; ref->status = REF_STATUS_NONE;
if (args->stateless_rpc)
close(out);
if (use_sideband) if (use_sideband)
finish_async(&demux); finish_async(&demux);
return -1; return -1;