![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2011 22:20:39 +0000 (15:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2011 22:23:23 +0000 (15:23 -0700) | ||
| commit | 73776dc1ebb61bc797e9f2fcfdfcd773511dfb8a | |
| tree | 2056157e6ce9687b6ab843cdba4afcf512ecd4da | tree | snapshot |
| parent | f6b6098316192475ff0b3fa2ba894d7e555bdfac | commit | diff |
| parent | 09c9957cf77106ca6b49127d5df20080922c81a4 | commit | diff |
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
send-pack: avoid deadlock when pack-object dies early
Evil merge to adjust the way the use of pthreads in sideband-demultiplexor
was decided (earlier it was "if we are not on Windows", now it is "if we
are not using pthreads").
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
send-pack: avoid deadlock when pack-object dies early
Evil merge to adjust the way the use of pthreads in sideband-demultiplexor
was decided (earlier it was "if we are not on Windows", now it is "if we
are not using pthreads").
| builtin-send-pack.c | diff1 | | diff2 | | blob | history |