Merge branch 'mr/gitweb-snapshot'

diff --git a/builtin-count-objects.c b/builtin-count-objects.c
index 62fd1f0961a29cc81032d20b3fe37fcc91293407..1b0b6c84ea4279df56b82c5a406adbea59e58513 100644 (file)
--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c
@@ -60,7 +60,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
                hex[40] = 0;
                if (get_sha1_hex(hex, sha1))
                        die("internal error");
-               if (has_sha1_pack(sha1, NULL))
+               if (has_sha1_pack(sha1))
                        (*packed_loose)++;
        }
 }
@@ -83,7 +83,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
                OPT_END(),
        };
 
-       argc = parse_options(argc, argv, opts, count_objects_usage, 0);
+       argc = parse_options(argc, argv, prefix, opts, count_objects_usage, 0);
        /* we do not take arguments other than flags for now */
        if (argc)
                usage_with_options(count_objects_usage, opts);