Merge branch 'mh/config-flip-xbit-back-after-checking' into maint
"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/configmaint
						commit
						e524fb497a
					
				|  | @ -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"); | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @ -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 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano