Merge branch 'jc/cache-tree' into next

diff --git a/builtin-diff.c b/builtin-diff.c
index c543105b8ef6192d20fb844e489164f0a39dbe30..b6114ce948bfcb68018fb9799bb26836957bb9c2 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -307,7 +307,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
                if (!strcmp(obj->type, tree_type)) {
                        if (ARRAY_SIZE(ent) <= ents)
                                die("more than %d trees given: '%s'",
-                                   ARRAY_SIZE(ent), name);
+                                   (int) ARRAY_SIZE(ent), name);
                        obj->flags |= flags;
                        ent[ents].item = obj;
                        ent[ents].name = name;