Merge branch 'jc/diff' into next
* jc/diff: builtin-diff.c: die() formatting type fix.
This commit is contained in:
commit
88a3d24831
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user