From 39b4ac99686148d356f7ba3c0132eb55dfda4726 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Tue, 8 Nov 2005 09:23:37 +0100 Subject: 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 --- read-tree.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'read-tree.c') diff --git a/read-tree.c b/read-tree.c index 6a456ae611..df156ea0da 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++) { -- cgit v1.3-5-g9baa