]> git.ipfire.org Git - thirdparty/git.git/commitdiff
builtin/repack.c: pass "packtmp" to `generated_pack_populate()`
authorTaylor Blau <me@ttaylorr.com>
Wed, 15 Oct 2025 22:28:23 +0000 (18:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2025 17:08:54 +0000 (10:08 -0700)
In a similar spirit as previous commits, this function needs to know the
temporary pack prefix, which it currently accesses through the static
"packtmp" variable within builtin/repack.c.

Pass it explicitly as a function parameter to facilitate moving this
function out of builtin/repack.c entirely.

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

index bf413a6ee251dfaf093ec6eb236065bdee79707d..bed902addefcfd99488f9c5e45371ff2c9806e8b 100644 (file)
@@ -150,7 +150,8 @@ struct generated_pack {
        struct tempfile *tempfiles[ARRAY_SIZE(exts)];
 };
 
-static struct generated_pack *generated_pack_populate(const char *name)
+static struct generated_pack *generated_pack_populate(const char *name,
+                                                     const char *packtmp)
 {
        struct stat statbuf;
        struct strbuf path = STRBUF_INIT;
@@ -271,7 +272,7 @@ static void repack_promisor_objects(struct repository *repo,
                                          line.buf);
                write_promisor_file(promisor_name, NULL, 0);
 
-               item->util = generated_pack_populate(item->string);
+               item->util = generated_pack_populate(item->string, packtmp);
 
                free(promisor_name);
        }
@@ -896,7 +897,7 @@ static int finish_pack_objects_cmd(const struct git_hash_algo *algop,
                 */
                if (local) {
                        item = string_list_append(names, line.buf);
-                       item->util = generated_pack_populate(line.buf);
+                       item->util = generated_pack_populate(line.buf, packtmp);
                }
        }
        fclose(out);