Force core.filemode to false on Cygwin.

Many users have noticed that core.filemode doesn't appear to be
automatically set right on Cygwin when using a repository stored
on NTFS.  The issue is that Cygwin and NTFS correctly supports
the executable mode bit, and Git properly detected that, but most
native Windows applications tend to create files such that Cygwin
sees the executable bit set when it probably shouldn't be.

This is especially bad if the user's favorite editor deletes the
file then recreates it whenever they save (vs. just overwriting)
as now a file that was created with mode 0644 by checkout-index
appears to have mode 0755.

So we introduce NO_TRUSTABLE_FILEMODE, settable at compile time.
Setting this option forces core.filemode to false, even if the
detection code would have returned true.  This option should be
enabled by default on Cygwin.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 93dc4948d3cd6b655c2e0c630892e67b9ae656eb..fa1a02289c06630274eebbed25b022c4cfeea28b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,9 @@ all:
 # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
 # generally faster on your platform than accessing the working directory.
 #
 # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
 # generally faster on your platform than accessing the working directory.
 #

+# Define NO_TRUSTABLE_FILEMODE if your filesystem may claim to support
+# the executable mode bit, but doesn't really do so.
+#

 # Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
 #
 # Define NO_SOCKADDR_STORAGE if your platform does not have struct
 # Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
 #
 # Define NO_SOCKADDR_STORAGE if your platform does not have struct


@@ -361,6 +364,7 @@ ifeq ($(uname_O),Cygwin)
        NEEDS_LIBICONV = YesPlease
        NO_C99_FORMAT = YesPlease
        NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
        NEEDS_LIBICONV = YesPlease
        NO_C99_FORMAT = YesPlease
        NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes

+       NO_TRUSTABLE_FILEMODE = UnfortunatelyYes

        # There are conflicting reports about this.
        # On some boxes NO_MMAP is needed, and not so elsewhere.
        # Try commenting this out if you suspect MMAP is more efficient
        # There are conflicting reports about this.
        # On some boxes NO_MMAP is needed, and not so elsewhere.
        # Try commenting this out if you suspect MMAP is more efficient


@@ -521,6 +525,9 @@ endif
 ifdef NO_FAST_WORKING_DIRECTORY
        BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
 endif
 ifdef NO_FAST_WORKING_DIRECTORY
        BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
 endif

+ifdef NO_TRUSTABLE_FILEMODE
+       BASIC_CFLAGS += -DNO_TRUSTABLE_FILEMODE
+endif

 ifdef NO_IPV6
        BASIC_CFLAGS += -DNO_IPV6
 endif
 ifdef NO_IPV6
        BASIC_CFLAGS += -DNO_IPV6
 endif

diff --git a/builtin-init-db.c b/builtin-init-db.c
index 01f366ad0bf5860aaf9123ef5d5653c612871a9f..97fd82ff0664aa9a79cf1ace20dac1a5c0064743 100644 (file)
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -10,6 +10,12 @@
 #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates/"
 #endif
 
 #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates/"
 #endif
 

+#ifdef NO_TRUSTABLE_FILEMODE
+#define TEST_FILEMODE 0
+#else
+#define TEST_FILEMODE 1
+#endif
+

 static void safe_create_dir(const char *dir, int share)
 {
        if (mkdir(dir, 0777) < 0) {
 static void safe_create_dir(const char *dir, int share)
 {
        if (mkdir(dir, 0777) < 0) {


@@ -175,6 +181,7 @@ static int create_default_files(const char *git_dir, const char *template_path)
        struct stat st1;
        char repo_version_string[10];
        int reinit;
        struct stat st1;
        char repo_version_string[10];
        int reinit;

+       int filemode;

 
        if (len > sizeof(path)-50)
                die("insane git directory %s", git_dir);
 
        if (len > sizeof(path)-50)
                die("insane git directory %s", git_dir);


@@ -236,14 +243,14 @@ static int create_default_files(const char *git_dir, const char *template_path)
        strcpy(path + len, "config");
 
        /* Check filemode trustability */
        strcpy(path + len, "config");
 
        /* Check filemode trustability */

-       if (!lstat(path, &st1)) {
+       filemode = TEST_FILEMODE;
+       if (TEST_FILEMODE && !lstat(path, &st1)) {

                struct stat st2;
                struct stat st2;

-               int filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
+               filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&

                                !lstat(path, &st2) &&
                                st1.st_mode != st2.st_mode);
                                !lstat(path, &st2) &&
                                st1.st_mode != st2.st_mode);

-               git_config_set("core.filemode",
-                              filemode ? "true" : "false");

        }
        }

+       git_config_set("core.filemode", filemode ? "true" : "false");

 
        /* Enable logAllRefUpdates if a working tree is attached */
        if (!is_bare_git_dir(git_dir))
 
        /* Enable logAllRefUpdates if a working tree is attached */
        if (!is_bare_git_dir(git_dir))