[PATCH] git-init: don't base core.filemode on the ability to chmod.
- From
Martin Waitz <tali@admingilde.org>
- Date
- Oct 3, 2007, 23:19 UTC
- Message-ID
- <20071003231941.GA20800@admingilde.org>
- In-Reply-To
- <470388DC.4040504@viscovery.net>
At least on Linux the vfat file system honors chmod calls but does not store them permanently (as there is no on-disk format for it). So the filemode test which tries to chmod a file thinks that the file system does support file modes which will result in problems later after the file system got remounted.
Now we check both that new files are created without the executable bit and that we can actually modify it with chmod.
Signed-off-by: Martin Waitz <tali@admingilde.org> --- 8< --- builtin-init-db.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
On Wed, Oct 03, 2007 at 02:19:40PM +0200, Johannes Sixt wrote:
> On Windows, we don't get an executable bit at all. Better use both > heuristics, i.e. set core.filemode false if either one diagnoses an > unreliable x-bit.
this should work better for Windows. Previously I sent it only to Johannes and forgot to Cc the list.
diff --git a/builtin-init-db.c b/builtin-init-db.c index 763fa55..1d92916 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -247,7 +247,10 @@ static int create_default_files(const char *git_dir, const char *template_path) filemode = TEST_FILEMODE; if (TEST_FILEMODE && !lstat(path, &st1)) { struct stat st2; - filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) && + /* test that new files are not created with X bit */ + filemode = !(st1.st_mode & S_IXUSR); + /* test that we can modify the X bit */ + filemode &= (!chmod(path, st1.st_mode ^ S_IXUSR) && !lstat(path, &st2) && st1.st_mode != st2.st_mode); }
-- 1.5.3.3.8.g367dc7 -- Martin Waitz