From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramsay Jones Subject: [PATCH 2/3] t1301-*.sh: Fix the 'forced modes' test on cygwin Date: Thu, 16 Jun 2011 21:23:14 +0100 Message-ID: <4DFA6632.40607@ramsay1.demon.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: GIT Mailing-list , Jeff King , Erik Faye-Lund To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Jun 16 22:31:14 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QXJDe-0003BG-A1 for gcvg-git-2@lo.gmane.org; Thu, 16 Jun 2011 22:31:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756833Ab1FPUaj (ORCPT ); Thu, 16 Jun 2011 16:30:39 -0400 Received: from anchor-post-2.mail.demon.net ([195.173.77.133]:36028 "EHLO anchor-post-2.mail.demon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751901Ab1FPUag (ORCPT ); Thu, 16 Jun 2011 16:30:36 -0400 Received: from ramsay1.demon.co.uk ([193.237.126.196]) by anchor-post-2.mail.demon.net with esmtp (Exim 4.69) id 1QXJB6-0003lt-ju; Thu, 16 Jun 2011 20:28:37 +0000 User-Agent: Thunderbird 1.5.0.2 (Windows/20060308) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- compat/cygwin.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/compat/cygwin.c b/compat/cygwin.c index b4a51b9..b38dbd7 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; -- 1.7.5