Skip to content

Commit

Permalink
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' in…
Browse files Browse the repository at this point in the history
…to js/maint-send-pack-stateless-rpc-deadlock-fix

* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
  send-pack: unbreak push over stateless rpc
  • Loading branch information
Junio C Hamano committed May 5, 2011
2 parents 73776dc + e07fd15 commit 80b5b69
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion builtin-send-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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))
Expand Down Expand Up @@ -340,6 +339,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;
Expand Down

0 comments on commit 80b5b69

Please sign in to comment.