summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:20 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:20 -0800
commit33e7fefef6b68b300870e04904ad1db48be9b580 (patch)
tree2ec6cf691b2f86aa0830c6f2927ac661bf3db87e /merge-recursive.c
parent367d20ec6b9e8e297537f665fb528346bd0aff27 (diff)
parent6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b (diff)
downloadgit-33e7fefef6b68b300870e04904ad1db48be9b580.tar.gz
Merge branch 'tr/cache-tree'
* tr/cache-tree: reset: update cache-tree data when appropriate commit: write cache-tree data when writing index anyway Refactor cache_tree_update idiom from commit Test the current state of the cache-tree optimization Add test-scrap-cache-tree
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 5a2db296b8..d83cd6c662 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -264,7 +264,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
if (!cache_tree_fully_valid(active_cache_tree) &&
cache_tree_update(active_cache_tree,
- active_cache, active_nr, 0, 0) < 0)
+ active_cache, active_nr, 0, 0, 0) < 0)
die("error building trees");
result = lookup_tree(active_cache_tree->sha1);