{"thread":{"id":"43228","subject":"[PATCH] merge-recursive implicitely depends on trust_executable_bit","startedAt":"2006-11-06T10:38:52Z","lastAt":"2006-11-06T10:38:52Z","messageCount":1,"participants":["Alex Riesen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"294079","messageId":"81b0412b0611060238k29c20ff6le555aa0579ecc0ae@mail.gmail.com","threadId":"43228","inReplyTo":null,"subject":"[PATCH] merge-recursive implicitely depends on trust_executable_bit","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2006-11-06T10:38:52Z","receivedAt":"2006-11-06T10:38:52Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Read the configuration in to get core.filemode value for this\nparticular repository.\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\n\n\nFrom 193ac65259b5de19fae1a1bd5d4adb55988086f6 Mon Sep 17 00:00:00 2001\nFrom: Alex Riesen <raa.lkml@gmail.com>\nDate: Mon, 6 Nov 2006 09:24:17 +0100\nSubject: [PATCH] merge-recursive implicitely depends on trust_executable_bit (core.filemode).\nRead the configuration in to get its value for this particular repository\n---\n merge-recursive.c |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 2ba43ae..c81048d 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -1308,6 +1308,7 @@ int main(int argc, char *argv[])\n \tconst char *branch1, *branch2;\n \tstruct commit *result, *h1, *h2;\n \n+\tgit_config(git_default_config); /* core.filemode */\n \toriginal_index_file = getenv(\"GIT_INDEX_FILE\");\n \n \tif (!original_index_file)\n-- \n1.4.3.3.gb2828\n\n"}]}