From: Ramsay Jones Date: Thu, 16 Jun 2011 20:23:14 +0000 (+0100) Subject: t1301-*.sh: Fix the 'forced modes' test on cygwin X-Git-Tag: v1.7.7-rc0~103^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=452993c297530498780d4b0c7b2b267258cb625f;p=git.git t1301-*.sh: Fix the 'forced modes' test on cygwin 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 --- diff --git a/compat/cygwin.c b/compat/cygwin.c index b4a51b958..b38dbd7f8 100644 --- a/compat/cygwin.c +++ b/compat/cygwin.c @@ -114,8 +114,7 @@ static int git_cygwin_config(const char *var, const char *value, void *cb) static int init_stat(void) { - if (have_git_dir()) { - git_config(git_cygwin_config, NULL); + if (have_git_dir() && git_config(git_cygwin_config,NULL)) { if (!core_filemode && native_stat) { cygwin_stat_fn = cygwin_stat; cygwin_lstat_fn = cygwin_lstat;