Merge branch 'jk/push-client-deadlock-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 22:11:46 +0000 (15:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 22:11:46 +0000 (15:11 -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

1  2 
compat/mingw.h
compat/win32/pthread.h
diff --cc compat/mingw.h
Simple merge
Simple merge