Merge branch 'jc/c99'

diff --git a/builtin-count.c b/builtin-count.c
index 0256369d5b2d9f34a85755e8c5c37f35fbc78cf8..1d3729aa9914d6c68dbb6ad11cb46504b4a688e0 100644 (file)
--- a/builtin-count.c
+++ b/builtin-count.c
@@ -67,7 +67,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
        }
 }
 
-int cmd_count_objects(int ac, const char **av, char **ep)
+int cmd_count_objects(int ac, const char **av, const char *prefix)
 {
        int i;
        int verbose = 0;
@@ -105,6 +105,8 @@ int cmd_count_objects(int ac, const char **av, char **ep)
        }
        if (verbose) {
                struct packed_git *p;
+               if (!packed_git)
+                       prepare_packed_git();
                for (p = packed_git; p; p = p->next) {
                        if (!p->pack_local)
                                continue;