mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
ls-files and read-tree need core.filemode
ls-files.c and read-tree.c miss the default configuration, in particular the filemode=false part. The recent +x bit flip made me notice that, because git-merge refused to merge anything saying that git-pull.sh is not up to date. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
76bca9d1a9
commit
39b4ac9968
@ -570,6 +570,7 @@ int main(int argc, const char **argv)
|
||||
prefix = setup_git_directory();
|
||||
if (prefix)
|
||||
prefix_offset = strlen(prefix);
|
||||
git_config(git_default_config);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
|
@ -633,6 +633,8 @@ int main(int argc, char **argv)
|
||||
if (newfd < 0)
|
||||
die("unable to create new cachefile");
|
||||
|
||||
git_config(git_default_config);
|
||||
|
||||
merge = 0;
|
||||
reset = 0;
|
||||
for (i = 1; i < argc; i++) {
|
||||
|
Loading…
Reference in New Issue
Block a user