mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/push-deadlock-regression-fix' into maint

Browse Source 
"git push" had a handful of codepaths that could lead to a deadlock
when unexpected error happened, which has been fixed.

* jk/push-deadlock-regression-fix:
  send-pack: report signal death of pack-objects
  send-pack: read "unpack" status even on pack-objects failure
  send-pack: improve unpack-status error messages
  send-pack: use skip_prefix for parsing unpack status
  send-pack: extract parsing of "unpack" response
  receive-pack: fix deadlock when we cannot create tmpdir
This commit is contained in:
Junio C Hamano
2017-03-24 12:57:52 -07:00
parent 296ab786ee d1a13d3fcb
commit f4d3af1859
2 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/receive-pack.c
View File

@ -1664,8 +1664,11 @@ static const char *unpack(int err_fd, struct shallow_info *si)
}
tmp_objdir = tmp_objdir_create();
if (!tmp_objdir)
if (!tmp_objdir) {
if (err_fd > 0)
close(err_fd);
return "unable to create temporary object directory";
}
child.env = tmp_objdir_env(tmp_objdir);
/*