Merge branch 'jc/symref'

[git.git] / builtin-diff.c

diff --git a/builtin-diff.c b/builtin-diff.c
index c543105..636edbf 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -271,7 +271,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
         *
         * Other cases are errors.
         */
-       
+
        git_config(git_diff_config);
        init_revisions(&rev);
        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
@@ -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;
@@ -321,7 +321,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
                        blob[blobs].name = name;
                        blobs++;
                        continue;
-                       
+
                }
                die("unhandled object '%s' given.", name);
        }