Skip to content

Commit 1f32ecf

Browse files
mhaggergitster
authored andcommitted
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 daa22c6 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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 76f8611 commit 1f32ecf

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

builtin/init-db.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ static int create_default_files(const char *template_path)
254254
struct stat st2;
255255
filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
256256
!lstat(path, &st2) &&
257-
st1.st_mode != st2.st_mode);
257+
st1.st_mode != st2.st_mode &&
258+
!chmod(path, st1.st_mode));
258259
}
259260
git_config_set("core.filemode", filemode ? "true" : "false");
260261

t/t0001-init.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ check_config () {
1212
echo "expected a directory $1, a file $1/config and $1/refs"
1313
return 1
1414
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+
1522
bare=$(cd "$1" && git config --bool core.bare)
1623
worktree=$(cd "$1" && git config core.worktree) ||
1724
worktree=unset

0 commit comments

Comments
 (0)