Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
get_shallow_commits: Avoid memory leak if a commit has been reached already.
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index cdc2f780a277ad8b55eedf84cdfbafdd4732a711..cd2cc77bf47025a9dfc88f594961521c3ec8f22c 100644
(file)
--- 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)