@matheusbsbs / matheus-bagliano / commits / 1f32ecffd8

create_default_files(): don't set u+x bit on $GIT_DIR/config

Since time immemorial, the test of whether to set "core.filemode" has been done by trying to toggle the u+x bit on $GIT_DIR/config, which we know always exists, and then testing whether the change "took". I find it somewhat odd to use the config file for this test, but whatever. The test code didn't set the u+x bit back to its original state itself, instead relying on the subsequent call to git_config_set() to re-write the config file with correct permissions. But ever since daa22c6f8d config: preserve config file permissions on edits (2014-05-06) git_config_set() copies the permissions from the old config file to the new one. This is a good change in and of itself, but it invalidates the create_default_files()'s assumption, causing "git init" to leave the executable bit set on $GIT_DIR/config. Reset the permissions on $GIT_DIR/config when we are done with the test in create_default_files(). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael Haggerty committed Nov 18, 2014 at 14:50 UTC 1f32ecffd864ea5b339883f94463b0b69f4aeb35

2 files changed +9 -1

builtin/init-db.c

+2 -1

@@ -254,7 +254,8 @@ static int create_default_files(const char *template_path)

254 struct stat st2;

255 filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&

256 !lstat(path, &st2) &&

257 - st1.st_mode != st2.st_mode);

257 + st1.st_mode != st2.st_mode &&

258 + !chmod(path, st1.st_mode));

259 }

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

261

t/t0001-init.sh

@@ -12,6 +12,13 @@ check_config () {

12 echo "expected a directory $1, a file $1/config and $1/refs"

13 return 1

14 fi

15 +

16 + if test_have_prereq POSIXPERM && test -x "$1/config"

17 + then

18 + echo "$1/config is executable?"

19 + return 1

20 + fi

21 +

22 bare=$(cd "$1" && git config --bool core.bare)

23 worktree=$(cd "$1" && git config core.worktree) ||

24 worktree=unset