builtin/submodule--helper: factor out submodule updating

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index ea8bd9e2e27166aff8c408440ed9293fd3da9e4f..d51e2ce1ec016ab35f1781675ff70793f0b974d5 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -66,7 +66,7 @@ static int count_loose(const struct object_id *oid, const char *path, void *data
        else {
                loose_size += on_disk_bytes(st);
                loose++;
-               if (verbose && has_sha1_pack(oid->hash))
+               if (verbose && has_object_pack(oid))
                        packed_loose++;
        }
        return 0;
@@ -122,8 +122,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
                struct strbuf loose_buf = STRBUF_INIT;
                struct strbuf pack_buf = STRBUF_INIT;
                struct strbuf garbage_buf = STRBUF_INIT;
-               if (!get_packed_git(the_repository))
-                       prepare_packed_git(the_repository);
+
                for (p = get_packed_git(the_repository); p; p = p->next) {
                        if (!p->pack_local)
                                continue;