Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sha1-name.c: remove implicit dependency on the_index
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 8dba939d8f8393151a4ba2c1865c59f5c7a101fd..5fbd4253c1baa6a290c501112b4a4fdc55814eb1 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-3576,7
+3576,7
@@
int merge_recursive(struct merge_options *o,
discard_cache();
if (!o->call_depth)
- re
ad_cache(
);
+ re
po_read_index(the_repository
);
o->ancestor = "merged common ancestors";
clean = merge_trees(o, get_commit_tree(h1), get_commit_tree(h2),