kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Alex Riesen 2006-11-06 11:38:52 +01:00 committed by Junio C Hamano
parent fe732edee1
commit 9faed78f59
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
merge-recursive.c
View File

@ -1308,6 +1308,7 @@ int main(int argc, char *argv[])
const char *branch1, *branch2; const char *branch1, *branch2;
struct commit *result, *h1, *h2; struct commit *result, *h1, *h2;


git_config(git_default_config); /* core.filemode */
original_index_file = getenv("GIT_INDEX_FILE"); original_index_file = getenv("GIT_INDEX_FILE");


if (!original_index_file) if (!original_index_file)