diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-30 01:01:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-30 01:01:24 -0700 |
| commit | 88a3d24831e7c387db198d54c5e1ad1771f60f61 (patch) | |
| tree | 0831eba36aa31cea85046f57c7160d62155cbc7d /builtin-diff.c | |
| parent | Merge branch 'lt/push' into next (diff) | |
| parent | builtin-diff.c: die() formatting type fix. (diff) | |
| download | tgif-88a3d24831e7c387db198d54c5e1ad1771f60f61.tar.xz | |
Merge branch 'jc/diff' into next
* jc/diff:
builtin-diff.c: die() formatting type fix.
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index c543105b8e..b6114ce948 100644 --- 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; |