@matheusbsbs / matheus-bagliano / commits / 9faed78f59
Fork 0

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>

Alex Riesen committed Nov 6, 2006 at 11:38 UTC 9faed78f59046cb7cef7f132726bf81c5074b08d
1 file changed +1
merge-recursive.c
+1
@@ -1308,6 +1308,7 @@ int main(int argc, char *argv[])
1308 const char *branch1, *branch2;
1309 struct commit *result, *h1, *h2;
1310
1311 + git_config(git_default_config); /* core.filemode */
1312 original_index_file = getenv("GIT_INDEX_FILE");
1313
1314 if (!original_index_file)