]> git.ipfire.org Git - thirdparty/git.git/commitdiff
builtin/repack.c: avoid "the_repository" when repacking promisor objects
authorTaylor Blau <me@ttaylorr.com>
Wed, 15 Oct 2025 22:27:30 +0000 (18:27 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2025 17:08:53 +0000 (10:08 -0700)
Pass a "struct repository" pointer to the 'repack_promisor_objects()'
function to avoid using "the_repository".

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/repack.c

index 93802531e1a47475a9415b9ca363cae7e3b7df8e..4f08b57ddbde0ff60101fab5bb282e489b315118 100644 (file)
@@ -407,7 +407,8 @@ static int has_pack_ext(const struct generated_pack_data *data,
        BUG("unknown pack extension: '%s'", ext);
 }
 
-static void repack_promisor_objects(const struct pack_objects_args *args,
+static void repack_promisor_objects(struct repository *repo,
+                                   const struct pack_objects_args *args,
                                    struct string_list *names)
 {
        struct child_process cmd = CHILD_PROCESS_INIT;
@@ -424,7 +425,7 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
         * {type -> existing pack order} ordering when computing deltas instead
         * of a {type -> size} ordering, which may produce better deltas.
         */
-       for_each_packed_object(the_repository, write_oid, &cmd,
+       for_each_packed_object(repo, write_oid, &cmd,
                               FOR_EACH_OBJECT_PROMISOR_ONLY);
 
        if (cmd.in == -1) {
@@ -1458,7 +1459,7 @@ int cmd_repack(int argc,
                strvec_push(&cmd.args, "--delta-islands");
 
        if (pack_everything & ALL_INTO_ONE) {
-               repack_promisor_objects(&po_args, &names);
+               repack_promisor_objects(repo, &po_args, &names);
 
                if (has_existing_non_kept_packs(&existing) &&
                    delete_redundant &&