mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/config-flip-xbit-back-after-checking'

Browse Source 
* mh/config-flip-xbit-back-after-checking:
  create_default_files(): don't set u+x bit on $GIT_DIR/config
This commit is contained in:
Junio C Hamano
2014-12-05 11:43:10 -08:00
parent 0b0cd37920 1f32ecffd8
commit a633732440
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/init-db.c
View File

@ -254,7 +254,8 @@ static int create_default_files(const char *template_path)
struct stat st2; struct stat st2;
filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) && filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
!lstat(path, &st2) && !lstat(path, &st2) &&
st1.st_mode != st2.st_mode); st1.st_mode != st2.st_mode &&
!chmod(path, st1.st_mode));
} }
git_config_set("core.filemode", filemode ? "true" : "false"); git_config_set("core.filemode", filemode ? "true" : "false");

7
t/t0001-init.sh
View File

@ -12,6 +12,13 @@ check_config () {
echo "expected a directory $1, a file $1/config and $1/refs" echo "expected a directory $1, a file $1/config and $1/refs"
return 1 return 1
fi fi
if test_have_prereq POSIXPERM && test -x "$1/config"
then
echo "$1/config is executable?"
return 1
fi
bare=$(cd "$1" && git config --bool core.bare) bare=$(cd "$1" && git config --bool core.bare)
worktree=$(cd "$1" && git config core.worktree) || worktree=$(cd "$1" && git config core.worktree) ||
worktree=unset worktree=unset