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

Ramsay Jones · gitster · commit 452993c29753 · 2011-06-16T15:10:54.000-07:00
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 &lt;ramsay@ramsay1.demon.co.uk&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,7 @@ static int git_cygwin_config(const char var, const char value, void *cb)`
`114`	`114`
`115`	`115`	`static int init_stat(void)`
`116`	`116`	`{`
`117`		`- if (have_git_dir()) {`
`118`		`- git_config(git_cygwin_config, NULL);`
	`117`	`+ if (have_git_dir() && git_config(git_cygwin_config,NULL)) {`
`119`	`118`	`if (!core_filemode && native_stat) {`
`120`	`119`	`cygwin_stat_fn = cygwin_stat;`
`121`	`120`	`cygwin_lstat_fn = cygwin_lstat;`