OSDN Git Service

Merge branch 'jk/push-client-deadlock-fix' into HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:06 +0000 (14:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:06 +0000 (14:40 -0700)
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

1  2 
compat/mingw.h
compat/win32/pthread.h
run-command.c
run-command.h

diff --cc compat/mingw.h
Simple merge
Simple merge
diff --cc run-command.c
Simple merge
diff --cc run-command.h
Simple merge