Sync with v1.7.8.1

diff --git a/merge-recursive.c b/merge-recursive.c
index 5a2db296b83d1ab23bfce23913c036a71dc81398..d83cd6c662847fb51641d7b8bf16739e588f67a2 100644 (file)
--- 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);