packfile: add repository argument to prepare_packed_git_one

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/packfile.c b/packfile.c
index 94987634e517e83a8350d9a0870fc1da5634cc2c..b789d0f0a367d1cc6cdaab18dc34026a5f615654 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -735,7 +735,8 @@ static void report_pack_garbage(struct string_list *list)
        report_helper(list, seen_bits, first, list->nr);
 }
 
        report_helper(list, seen_bits, first, list->nr);
 }
 

-static void prepare_packed_git_one(char *objdir, int local)
+#define prepare_packed_git_one(r, o, l) prepare_packed_git_one_##r(o, l)
+static void prepare_packed_git_one_the_repository(char *objdir, int local)

 {
        struct strbuf path = STRBUF_INIT;
        size_t dirnamelen;
 {
        struct strbuf path = STRBUF_INIT;
        size_t dirnamelen;


@@ -889,10 +890,10 @@ void prepare_packed_git(void)
 
        if (the_repository->objects->packed_git_initialized)
                return;
 
        if (the_repository->objects->packed_git_initialized)
                return;

-       prepare_packed_git_one(get_object_directory(), 1);
+       prepare_packed_git_one(the_repository, get_object_directory(), 1);

        prepare_alt_odb(the_repository);
        for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)
        prepare_alt_odb(the_repository);
        for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)

-               prepare_packed_git_one(alt->path, 0);
+               prepare_packed_git_one(the_repository, alt->path, 0);

        rearrange_packed_git(the_repository);
        prepare_packed_git_mru(the_repository);
        the_repository->objects->packed_git_initialized = 1;
        rearrange_packed_git(the_repository);
        prepare_packed_git_mru(the_repository);
        the_repository->objects->packed_git_initialized = 1;