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

Merge branch 'jk/push-client-deadlock-fix' into HEAD

Browse Source 
Some Windows SDK lacks pthread_sigmask() implementation and fails
to compile the recently updated "git push" codepath that uses it.

* jk/push-client-deadlock-fix:
  Windows: only add a no-op pthread_sigmask() when needed
  Windows: add pthread_sigmask() that does nothing
  t5504: drop sigpipe=ok from push tests
  fetch-pack: isolate sigpipe in demuxer thread
  send-pack: isolate sigpipe in demuxer thread
  run-command: teach async threads to ignore SIGPIPE
  send-pack: close demux pipe before finishing async process
This commit is contained in:
Junio C Hamano
2016-05-18 14:40:06 -07:00
parent 920f2ea33b ed84387a6b
commit c555e529ac
7 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t5504-fetch-receive-strict.sh
View File

@ -100,11 +100,8 @@ test_expect_success 'push with receive.fsckobjects' '
git config receive.fsckobjects true &&
git config transfer.fsckobjects false
) &&
test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act &&
{
test_cmp exp act ||
! test -s act
}
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
test_cmp exp act
'
test_expect_success 'push with transfer.fsckobjects' '
@ -114,7 +111,8 @@ test_expect_success 'push with transfer.fsckobjects' '
cd dst &&
git config transfer.fsckobjects true
) &&
test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
test_cmp exp act
'
cat >bogus-commit <<\EOF