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: avoid deadlock when pack-object dies early
This commit is contained in:
Junio C Hamano
2011-04-28 14:19:32 -07:00
parent d1e8d0d9a1 73776dc1eb
commit db7e04a1d4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/send-pack.c
View File

@@ -101,6 +101,7 @@ 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))
@@ -229,6 +230,9 @@ static void print_helper_status(struct ref *ref)
static int sideband_demux(int in, int out, void *data)
{
int *fd = data;
#ifdef NO_PTHREADS
close(fd[1]);
#endif
int ret = recv_sideband("send-pack", fd[0], out);
close(out);
return ret;