提交 39b4ac99 编写于 作者: A Alex Riesen 提交者: Junio C Hamano

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: NJunio C Hamano <junkio@cox.net>
上级 76bca9d1
......@@ -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++) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册