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>
Alex Riesen committed
Nov 8, 2005 at 09:23 UTC
39b4ac99686148d356f7ba3c0132eb55dfda4726
2 files changed
+3
ls-files.c
+1
@@ -570,6 +570,7 @@ int main(int argc, const char **argv)
570
prefix = setup_git_directory();
571
if (prefix)
572
prefix_offset = strlen(prefix);
573
+ git_config(git_default_config);
574
575
for (i = 1; i < argc; i++) {
576
const char *arg = argv[i];
read-tree.c
+2
@@ -633,6 +633,8 @@ int main(int argc, char **argv)
633
if (newfd < 0)
634
die("unable to create new cachefile");
635
636
+ git_config(git_default_config);
637
+
638
merge = 0;
639
reset = 0;
640
for (i = 1; i < argc; i++) {