OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe732ed
)
merge-recursive implicitely depends on trust_executable_bit
author
Alex Riesen
<raa.lkml@gmail.com>
Mon, 6 Nov 2006 10:38:52 +0000
(11:38 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 6 Nov 2006 16:42:02 +0000
(08:42 -0800)
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>
merge-recursive.c
patch
|
blob
|
history
diff --git
a/merge-recursive.c
b/merge-recursive.c
index
2ba43ae
..
c81048d
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)