@matheusbsbs / matheus-bagliano / commits / c869753ebb
Fork 0

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>

Shawn O. Pearce committed Dec 30, 2006 at 23:53 UTC c869753ebbb00e188da5ab308d42cc738335f0ab
2 files changed +18 -4
Makefile
+7
@@ -72,6 +72,9 @@ all:
72 # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
73 # generally faster on your platform than accessing the working directory.
74 #
75 +# Define NO_TRUSTABLE_FILEMODE if your filesystem may claim to support
76 +# the executable mode bit, but doesn't really do so.
77 +#
78 # Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
79 #
80 # Define NO_SOCKADDR_STORAGE if your platform does not have struct
@@ -361,6 +364,7 @@ ifeq ($(uname_O),Cygwin)
364 NEEDS_LIBICONV = YesPlease
365 NO_C99_FORMAT = YesPlease
366 NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
367 + NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
368 # There are conflicting reports about this.
369 # On some boxes NO_MMAP is needed, and not so elsewhere.
370 # Try commenting this out if you suspect MMAP is more efficient
@@ -521,6 +525,9 @@ endif
525 ifdef NO_FAST_WORKING_DIRECTORY
526 BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
527 endif
528 +ifdef NO_TRUSTABLE_FILEMODE
529 + BASIC_CFLAGS += -DNO_TRUSTABLE_FILEMODE
530 +endif
531 ifdef NO_IPV6
532 BASIC_CFLAGS += -DNO_IPV6
533 endif
builtin-init-db.c
+11 -4
@@ -10,6 +10,12 @@
10 #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates/"
11 #endif
12
13 +#ifdef NO_TRUSTABLE_FILEMODE
14 +#define TEST_FILEMODE 0
15 +#else
16 +#define TEST_FILEMODE 1
17 +#endif
18 +
19 static void safe_create_dir(const char *dir, int share)
20 {
21 if (mkdir(dir, 0777) < 0) {
@@ -175,6 +181,7 @@ static int create_default_files(const char *git_dir, const char *template_path)
181 struct stat st1;
182 char repo_version_string[10];
183 int reinit;
184 + int filemode;
185
186 if (len > sizeof(path)-50)
187 die("insane git directory %s", git_dir);
@@ -236,14 +243,14 @@ static int create_default_files(const char *git_dir, const char *template_path)
243 strcpy(path + len, "config");
244
245 /* Check filemode trustability */
239 - if (!lstat(path, &st1)) {
246 + filemode = TEST_FILEMODE;
247 + if (TEST_FILEMODE && !lstat(path, &st1)) {
248 struct stat st2;
241 - int filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
249 + filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
250 !lstat(path, &st2) &&
251 st1.st_mode != st2.st_mode);
244 - git_config_set("core.filemode",
245 - filemode ? "true" : "false");
252 }
253 + git_config_set("core.filemode", filemode ? "true" : "false");
254
255 /* Enable logAllRefUpdates if a working tree is attached */
256 if (!is_bare_git_dir(git_dir))