git/compat, branch v1.7.2

Merge branch 'js/async-thread'

2010-06-21T13:02:45Z

* 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

Merge branch 'js/maint-windows'

2010-06-13T18:21:30Z

* js/maint-windows: Recent MinGW has a C99 implementation of snprintf functions mingw: use _commit to implement fsync

Merge branch 'np/malloc-threading'

2010-05-21T11:02:16Z

* np/malloc-threading: Thread-safe xmalloc and xrealloc needs a recursive mutex Make xmalloc and xrealloc thread-safe

mingw: use _commit to implement fsync

2010-05-20T23:12:46Z

Signed-off-by: Erik Faye-Lund Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Fix checkout of large files to network shares on Windows XP

2010-05-20T23:12:13Z

Bigger writes to network drives on Windows XP fail. Cap them at 31MB to allow them to succeed. Callers need to be prepared for write() calls that do less work than requested anyway. On local drives, write() calls are translated to WriteFile() calls with a cap of 64KB on Windows XP and 256KB on Vista. Thus a cap of 31MB won't affect the number of WriteFile() calls which do the actual work. There's still room for some other version of Windows to use a chunk size of 1MB without increasing the number of system calls. Signed-off-by: Rene Scharfe Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Fix "Out of memory? mmap failed" for files larger than 4GB on Windows

2010-05-20T23:11:06Z

The git_mmap implementation was broken for file sizes that wouldn't fit into a size_t (32 bits). This was caused by intermediate variables that were only 32 bits wide when they should be 64 bits. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-04-20T05:41:30Z

* maint: t7012: Mark missing tests as TODO reflog: remove 'show' from 'expire's usage string MSVC: Fix build by adding missing termios.h dummy

Merge branch 'maint-1.6.6' into maint

2010-04-19T08:28:27Z

* maint-1.6.6: MSVC: Fix build by adding missing termios.h dummy

MSVC: Fix build by adding missing termios.h dummy

2010-04-19T08:28:21Z

A use of this header file was introduced in eb80042 (Add missing #include to support TIOCGWINSZ on Solaris, 2010-01-11). Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'jl/maint-submodule-gitfile-awareness'

2010-04-11T20:54:28Z

* jl/maint-submodule-gitfile-awareness: Windows: start_command: Support non-NULL dir in struct child_process