Merge branch 'jc/grep' into next

diff --git a/write-tree.c b/write-tree.c
index a5069921a0f01e872c5e7c62f836cd0b4441e551..7a4f691d8ab8f6f560685ec6fe71cf2d82e8a018 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
        if (!was_valid) {
                if (cache_tree_update(active_cache_tree,
                                      active_cache, active_nr,
-                                     missing_ok) < 0)
+                                     missing_ok, 0) < 0)
                        die("git-write-tree: error building trees");
                if (0 <= newfd) {
                        if (!write_cache(newfd, active_cache, active_nr))