git/compat, branch v2.8.2

Merge branch 'js/mingw-tests-2.8' into maint

2016-04-29T21:16:01Z

Code clean-up. * js/mingw-tests-2.8: Windows: shorten code by re-using convert_slashes()

Windows: shorten code by re-using convert_slashes()

2016-04-05T01:03:02Z

Make a few more spots more readable by using the recently introduced, Windows-specific helper. Signed-off-by: Johannes Sixt Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano

MSVC: use shipped headers instead of fallback definitions

2016-03-30T18:16:20Z

VS2010 comes with stdint.h [1] VS2013 comes with inttypes.h [2] [1] https://stackoverflow.com/a/2628014/3906760 [2] https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/ Signed-off-by: Sven Strickroth Acked-by: Johannes Schindelin Acked-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

2016-03-30T18:13:01Z

In MSVC2015 the behavior of vsnprintf was changed. W/o this fix there is one character missing at the end. Signed-off-by: Sven Strickroth Acked-by: Johannes Schindelin Acked-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

config --show-origin: report paths with forward slashes

2016-03-23T16:58:48Z

On Windows, the backslash is the native directory separator, but all supported Windows versions also accept the forward slash in most circumstances. Our tests expect forward slashes. Relative paths are generated by Git using forward slashes. So let's try to be consistent and use forward slashes in the $HOME part of the paths reported by `git config --show-origin`, too. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'js/pthread-exit-emu-windows'

2016-03-04T21:46:39Z

* js/pthread-exit-emu-windows: Mark win32's pthread_exit() as NORETURN

Merge branch 'jk/tighten-alloc'

2016-03-04T21:46:25Z

* jk/tighten-alloc: compat/mingw: brown paper bag fix for 50a6c8e

Mark win32's pthread_exit() as NORETURN

2016-03-02T20:33:43Z

The pthread_exit() function is not expected to return. Ever. On Windows, we call ExitThread() whose documentation claims: "Ends the calling thread", i.e. there is no condition in which this function simply returns: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682659 While at it, fix the return type to be void, as per http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_exit.html Pointed out by Jeff King, helped by Stefan Naewe, Junio Hamano & Johannes Sixt. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

compat/mingw: brown paper bag fix for 50a6c8e

2016-02-29T19:04:23Z

Commit 50a6c8e (use st_add and st_mult for allocation size computation, 2016-02-22) fixed up many xmalloc call-sites including ones in compat/mingw.c. But I screwed up one of them, which was half-converted to ALLOC_ARRAY, using a very early prototype of the function. And I never caught it because I don't build on Windows. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ps/config-error'

2016-02-26T21:37:19Z

Many codepaths forget to check return value from git_config_set(); the function is made to die() to make sure we do not proceed when setting a configuration variable failed. * ps/config-error: config: rename git_config_set_or_die to git_config_set config: rename git_config_set to git_config_set_gently compat: die when unable to set core.precomposeunicode sequencer: die on config error when saving replay opts init-db: die on config errors when initializing empty repo clone: die on config error in cmd_clone remote: die on config error when manipulating remotes remote: die on config error when setting/adding branches remote: die on config error when setting URL submodule--helper: die on config error when cloning module submodule: die on config error when linking modules branch: die on config error when editing branch description branch: die on config error when unsetting upstream branch: report errors in tracking branch setup config: introduce set_or_die wrappers