From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 6 Nov 2006 10:38:52 +0000 (+0100)
Subject: merge-recursive implicitely depends on trust_executable_bit
X-Git-Tag: v1.4.4-rc1~1^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9faed78f59046cb7cef7f132726bf81c5074b08d;p=git.git

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 <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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)