1. Stefan Saasen
  2. git


Alex Riesen  committed 9faed78

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>

  • Participants
  • Parent commits fe732ed
  • Branches master

Comments (0)

Files changed (1)

File merge-recursive.c

View file
 	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)