diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-05 13:46:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-05 13:46:36 -0700 |
| commit | 80b5b6985510406dfb4016cada8013832078930c (patch) | |
| tree | 3c3dd8cbe424895703d1f9593b2242b33d45875d | |
| parent | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... (diff) | |
| parent | send-pack: unbreak push over stateless rpc (diff) | |
| download | tgif-80b5b6985510406dfb4016cada8013832078930c.tar.xz | |
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into 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
| -rw-r--r-- | builtin-send-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-send-pack.c b/builtin-send-pack.c index f6e99f5690..aef47f8611 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -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)) @@ -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; |