threads / patch / 38022

v3Improve the filemode trustability check

Subject: [PATCH v3] Improve the filemode trustability check

## tl;dr

One message between Nov 21, 2014 and Nov 21, 2014. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Torsten Bögershausen· Nov 21, 2014, 09:34 UTC · lore
Some file systems do not support the executable bit:
a) The user executable bit is always 0, e.g. VFAT mounted with -onoexec
b) The user executable bit is always 1, e.g. cifs mounted with -ofile_mode=0755
c) There are system where user executable bit is 1 even if it should be 0
   like b), but the file mode can be maintained locally. chmod -x changes the
   file mode from 0766 to 0666, until the file system is unmounted and
   remounted and the file mode is 0766 again.
   This been observed when a Windows machine with NTFS exports a share to
   Mac OS X via smb or afp.

Case a) and b) are handled by the current code. Case c) qualifies as "non trustable executable bit" and core.filemode should be false, but this is currently not done.

Detect when ".git/config" has the user executable bit set after creat(".git/config", 0666) and set core.filemode to false.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---

Thanks for the review, I never paid attention to the re-init. The following works for me:

 builtin/init-db.c | 2 ++
 1 file changed, 2 insertions(+)
Show changes to builtin/init-db.c +2 −0
diff --git a/builtin/init-db.c b/builtin/init-db.c
index aab44d2..2619ca5 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -256,6 +256,8 @@ static int create_default_files(const char *template_path)
 				!lstat(path, &st2) &&
 				st1.st_mode != st2.st_mode &&
 				!chmod(path, st1.st_mode));
+		if (filemode && !reinit && (st1.st_mode & S_IXUSR))
+			filemode = 0;
 	}
 	git_config_set("core.filemode", filemode ? "true" : "false");
 
-- 
2.0.0.GIT

← back to recent threads