summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2006-11-06 10:38:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-06 16:42:02 (GMT)
commit9faed78f59046cb7cef7f132726bf81c5074b08d (patch)
treea43ac0e5d86936791bb70b7fd2436bb925bf5961 /merge-recursive.c
parentfe732edee10f9b241c8df9b4ea081a4f33ad3968 (diff)
downloadgit-9faed78f59046cb7cef7f132726bf81c5074b08d.zip
git-9faed78f59046cb7cef7f132726bf81c5074b08d.tar.gz
git-9faed78f59046cb7cef7f132726bf81c5074b08d.tar.bz2
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c1
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)