![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jun 2010 13:02:45 +0000 (06:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jun 2010 13:02:45 +0000 (06:02 -0700) | ||
| commit | 762655010d6f051f632a77b8c5b95b9f5cad02c9 | |
| tree | 8f9b2d9a72a1e1af33eaa26fd94516391f23ad62 | tree | snapshot |
| parent | 8d676d85f772ce3a100b6f0dddd1c34a7e4313cf | commit | diff |
| parent | 3e333036ccbb97fddf54bd8fe74b12ba46f1687b | commit | diff |
Merge branch 'js/async-thread'
* js/async-thread:
fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
Enable threaded async procedures whenever pthreads is available
Dying in an async procedure should only exit the thread, not the process.
Reimplement async procedures using pthreads
Windows: more pthreads functions
Fix signature of fcntl() compatibility dummy
Make report() from usage.c public as vreportf() and use it.
Modernize t5530-upload-pack-error.
Conflicts:
http-backend.c
* js/async-thread:
fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
Enable threaded async procedures whenever pthreads is available
Dying in an async procedure should only exit the thread, not the process.
Reimplement async procedures using pthreads
Windows: more pthreads functions
Fix signature of fcntl() compatibility dummy
Make report() from usage.c public as vreportf() and use it.
Modernize t5530-upload-pack-error.
Conflicts:
http-backend.c
| compat/mingw.h | diff1 | | diff2 | | blob | history |
| compat/win32/pthread.h | diff1 | | diff2 | | blob | history |
| git-compat-util.h | diff1 | | diff2 | | blob | history |
| http-backend.c | diff1 | | diff2 | | blob | history |
| run-command.c | diff1 | | diff2 | | blob | history |