summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2005-11-08 08:23:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-08 09:23:52 (GMT)
commit39b4ac99686148d356f7ba3c0132eb55dfda4726 (patch)
treecc093fc05d8144c03ec16f8e56195043dd150bce
parent76bca9d1a95c0fbf9e31bcb7b6a52e1d318577e7 (diff)
downloadgit-39b4ac99686148d356f7ba3c0132eb55dfda4726.zip
git-39b4ac99686148d356f7ba3c0132eb55dfda4726.tar.gz
git-39b4ac99686148d356f7ba3c0132eb55dfda4726.tar.bz2
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>
-rw-r--r--ls-files.c1
-rw-r--r--read-tree.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/ls-files.c b/ls-files.c
index f7653e7..db2288a 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -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];
diff --git a/read-tree.c b/read-tree.c
index 6a456ae..df156ea 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -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++) {