Merge branch 'jc/diff' into next

* jc/diff: builtin-diff.c: die() formatting type fix.
19 years ago · 88a3d24831
1 changed files with 1 additions and 1 deletions
--- a/builtin-diff.c
+++ b/builtin-diff.c
@ -307,7 +307,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
				@@ -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;