git/compat, branch v2.12.2

Merge branch 'js/mingw-isatty'

2017-02-16T22:45:13Z

A hotfix for a topic already in 'master'. * js/mingw-isatty: mingw: make stderr unbuffered again

mingw: make stderr unbuffered again

2017-02-14T18:54:21Z

When removing the hack for isatty(), we actually removed more than just an isatty() hack: we removed the hack where internal data structures of the MSVC runtime are modified in order to redirect stdout/stderr. Instead of using that hack (that does not work with newer versions of the runtime, anyway), we replaced it by reopening the respective file descriptors. What we forgot was to mark stderr as unbuffered again. Reported by Hannes Sixt. Fixed with Jeff Hostetler's assistance. Signed-off-by: Johannes Schindelin Tested-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'rs/qsort-s'

2017-01-31T21:15:00Z

A few codepaths had to rely on a global variable when sorting elements of an array because sort(3) API does not allow extra data to be passed to the comparison function. Use qsort_s() when natively available, and a fallback implementation of it when not, to eliminate the need, which is a prerequisite for making the codepath reentrant. * rs/qsort-s: ref-filter: use QSORT_S in ref_array_sort() string-list: use QSORT_S in string_list_sort() perf: add basic sort performance test add QSORT_S compat: add qsort_s()

Merge branch 'js/mingw-isatty'

2017-01-31T21:14:58Z

An update to a topic that is already in 'master'. * js/mingw-isatty: mingw: follow-up to "replace isatty() hack"

compat: add qsort_s()

2017-01-23T19:02:34Z

The function qsort_s() was introduced with C11 Annex K; it provides the ability to pass a context pointer to the comparison function, supports the convention of using a NULL pointer for an empty array and performs a few safety checks. Add an implementation based on compat/qsort.c for platforms that lack a native standards-compliant qsort_s() (i.e. basically everyone). It doesn't perform the full range of possible checks: It uses size_t instead of rsize_t and doesn't check nmemb and size against RSIZE_MAX because we probably don't have the restricted size type defined. For the same reason it returns int instead of errno_t. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

mingw: follow-up to "replace isatty() hack"

2017-01-18T21:31:25Z

The version of the "replace isatty() hack" that got merged a few weeks ago did not actually reflect the latest iteration of the patch series: v3 was sent out with these changes, as requested by the reviewer Johannes Sixt: - reworded the comment about "recycling handles" - moved the reassignment of the `console` variable before the dup2() call so that it is valid at all times - removed the "handle = INVALID_HANDLE_VALUE" assignment, as the local variable `handle` is not used afterwards anyway Signed-off-by: Johannes Schindelin Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'mk/mingw-winansi-ttyname-termination-fix' into maint

2017-01-17T23:19:03Z

A potential but unlikely buffer overflow in Windows port has been fixed. * mk/mingw-winansi-ttyname-termination-fix: mingw: consider that UNICODE_STRING::Length counts bytes

Merge branch 'js/mingw-isatty'

2016-12-27T08:11:46Z

Update the isatty() emulation for Windows by updating the previous hack that depended on internals of (older) MSVC runtime. * js/mingw-isatty: mingw: replace isatty() hack mingw: fix colourization on Cygwin pseudo terminals mingw: adjust is_console() to work with stdin

Merge branch 'mk/mingw-winansi-ttyname-termination-fix'

2016-12-27T08:11:44Z

A potential but unlikely buffer overflow in Windows port has been fixed. * mk/mingw-winansi-ttyname-termination-fix: mingw: consider that UNICODE_STRING::Length counts bytes

mingw: replace isatty() hack

2016-12-22T17:58:46Z

Git for Windows has carried a patch that depended on internals of MSVC runtime, but it does not work correctly with recent MSVC runtime. A replacement was written originally for compiling with VC++. The patch in this message is a backport of that replacement, and it also fixes the previous attempt to make isatty() tell that /dev/null is *not* an interactive terminal. Signed-off-by: Jeff Hostetler Tested-by: Beat Bolli Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano