# [PATCH] merge-recursive implicitely depends on trust_executable_bit 1 messages from 2006-11-06 to 2006-11-06. Participants: Alex Riesen. Thread: https://gitlist.dev/t/43228 ## Alex Riesen, 2006-11-06 10:38 Subject: [PATCH] merge-recursive implicitely depends on trust_executable_bit Message-ID: <81b0412b0611060238k29c20ff6le555aa0579ecc0ae@mail.gmail.com> URL: https://gitlist.dev/e/81b0412b0611060238k29c20ff6le555aa0579ecc0ae%40mail.gmail.com ``` Read the configuration in to get core.filemode value for this particular repository. Signed-off-by: Alex Riesen From 193ac65259b5de19fae1a1bd5d4adb55988086f6 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Mon, 6 Nov 2006 09:24:17 +0100 Subject: [PATCH] merge-recursive implicitely depends on trust_executable_bit (core.filemode). Read the configuration in to get its value for this particular repository --- merge-recursive.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 2ba43ae..c81048d 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) -- 1.4.3.3.gb2828 ```