| commit | 2644e74ef0d01987f3ab5cf17236f7c8512403d4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:07 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:07 +0000 (4 17:50 -0700) | ||
| tree | 71804e03baa50ebe22662a723ff0ebde215c2e50 | treesnapshot (tar.gz zip) |
| parent | 3bf7886705b4ea7189f046fa5258fdf6edcdbe23 | commitdiff |
| parent | 0ea1c89ba616397ef7e5f6f601ef7a24d2c27b8e | commitdiff |
Merge branch 'js/async-thread' (early part) into next
* 'js/async-thread' (early part):
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' (early part):
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
| Makefile | diff1 | diff2 | blobhistory |
| compat/mingw.h | diff1 | diff2 | blobhistory |
| git-compat-util.h | diff1 | diff2 | blobhistory |
| http-backend.c | diff1 | diff2 | blobhistory |
| run-command.c | diff1 | diff2 | blobhistory |