Skip to content

Commit

Permalink
Merge branch 'mh/config-flip-xbit-back-after-checking' into maint
Browse files Browse the repository at this point in the history
"git init" (hence "git clone") initialized the per-repository
configuration file .git/config with x-bit by mistake.

* mh/config-flip-xbit-back-after-checking:
  create_default_files(): don't set u+x bit on $GIT_DIR/config
  • Loading branch information
Junio C Hamano committed Dec 22, 2014
2 parents 0b5c641 + 1f32ecf commit e524fb4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion builtin/init-db.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ static int create_default_files(const char *template_path)
struct stat st2;
filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
!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");

Expand Down
7 changes: 7 additions & 0 deletions t/t0001-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ check_config () {
echo "expected a directory $1, a file $1/config and $1/refs"
return 1
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)
worktree=$(cd "$1" && git config core.worktree) ||
worktree=unset
Expand Down

0 comments on commit e524fb4

Please sign in to comment.