Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index cc664c39b66b0bb499dec13a22880a6096423fa6..e22a5195f65cac2872933b668180ceb3c80d3e7c 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -265,7 +265,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);