user/sven/git.git/compat, branch v1.7.7.4

cleanup: use internal memory allocation wrapper functions everywhere

2011-10-06T20:54:32Z

The "x"-prefixed versions of strdup, malloc, etc. will check whether the allocation was successful and terminate the process otherwise. A few uses of malloc were left alone since they already implemented a graceful path of failure or were in a quasi external library like xdiff. Additionally, the call to malloc in compat/win32/syslog.c was not modified since the syslog() implemented there is a die handler and a call to the x-wrappers within a die handler could result in recursion should memory allocation fail. This will have to be addressed separately. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

obstack: Fix portability issues

2011-08-29T05:03:26Z

i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1, SunOS 5.10, and possibly others do not have exit.h and exitfail.h. Remove the use of these in obstack.c. The __block variable was renamed to block to avoid a gcc error: compat/obstack.h:190: error: __block attribute can be specified on variables only Initial-patch-by: David Aguilar Reported-by: Brian Gernhardt Signed-off-by: Fredrik Kuivinen Acked-by: David Aguilar Signed-off-by: Junio C Hamano

Add obstack.[ch] from EGLIBC 2.10

2011-08-21T05:30:46Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-cygwin-trust-executable-bit-default'

2011-07-13T21:31:36Z

* jc/maint-cygwin-trust-executable-bit-default: cygwin: trust executable bit by default

Merge branch 'rj/config-cygwin'

2011-07-13T21:31:36Z

* rj/config-cygwin: config.c: Make git_config() work correctly when called recursively t1301-*.sh: Fix the 'forced modes' test on cygwin help.c: Fix detection of custom merge strategy on cygwin

Merge branch 'ef/maint-win-verify-path'

2011-06-30T00:09:17Z

* ef/maint-win-verify-path: verify_dotfile(): do not assume '/' is the path seperator verify_path(): simplify check at the directory boundary verify_path: consider dos drive prefix real_path: do not assume '/' is the path seperator A Windows path starting with a backslash is absolute

Merge branch 'js/i18n-windows'

2011-06-30T00:03:13Z

* js/i18n-windows: Windows: teach getenv to do a case-sensitive search mingw.c: move definition of mingw_getenv down sh-i18n--envsubst: do not crash when no arguments are given

cygwin: trust executable bit by default

2011-06-20T20:09:04Z

Earlier 7974843 (compat/cygwin.c: make runtime detection of lstat/stat lessor impact, 2008-10-23) fixed the low-level "do we use cygwin specific hacks for stat/lstat?" logic not to call into git_default_config() from random codepaths that are typically very late in the program, to prevent the call from potentially overwriting other variables that are initialized from the configuration. However, it forgot that on Cygwin, trust-executable-bit should default to true. Noticed by J6t, confirmed by Ramsay Jones, and the brown paper bag is on Gitster's head. Signed-off-by: Junio C Hamano

t1301-*.sh: Fix the 'forced modes' test on cygwin

2011-06-16T22:10:54Z

The 'forced modes' test fails on cygwin because the post-update hook loses it's executable bit when copied from the templates directory by git-init. The template loses it's executable bit because the lstat() function resolves to the "native Win32 API" implementation. This call to lstat() happens after git-init has set the "git_dir" (so has_git_dir() returns true), but before the configuration has been fully initialised. At this point git_config() does not find any config files to parse and returns 0. Unfortunately, the code used to determine the cygwin l/stat() function bindings did not check the return from git_config() and assumed that the config was complete and accessible once "git_dir" was set. In order to fix the test, we simply change the binding code to test the return value from git_config(), to ensure that it actually had config values to read, before determining the requested binding. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

Windows: teach getenv to do a case-sensitive search

2011-06-06T18:35:10Z

getenv() on Windows looks up environment variables in a case-insensitive manner. Even though all documentations claim that the environment is case-insensitive, it is possible for applications to pass an environment to child processes that has variables that differ only in case. Bash on Windows does this, for example, and sh-i18n--envsubst depends on this behavior. With this patch environment variables are first looked up in a case-sensitive manner; only if this finds nothing, the system's getenv() is used as a fallback. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano