From 9faed78f59046cb7cef7f132726bf81c5074b08d Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Mon, 6 Nov 2006 11:38:52 +0100 Subject: [PATCH] merge-recursive implicitely depends on trust_executable_bit Read the configuration in to get core.filemode value for this particular repository. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- merge-recursive.c | 1 + 1 file changed, 1 insertion(+) diff --git a/merge-recursive.c b/merge-recursive.c index 2ba43ae84..c81048d7a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1308,6 +1308,7 @@ int main(int argc, char *argv[]) const char *branch1, *branch2; struct commit *result, *h1, *h2; + git_config(git_default_config); /* core.filemode */ original_index_file = getenv("GIT_INDEX_FILE"); if (!original_index_file) -- 2.30.2