pack: move prepare_packed_git_run_once to object store

Each repository's object store can be initialized independently, so
they must not share a run_once variable.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.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/object-store.h b/object-store.h
index c687ab7587fb7f71128067f47f757c6b8b9091a5..6a07a14d63b78c18c33f7d3f34b7d1db375c5bee 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -98,6 +98,12 @@ struct raw_object_store {
        struct packed_git *packed_git;
        /* A most-recently-used ordered version of the packed_git list. */
        struct list_head packed_git_mru;
+
+       /*
+        * Whether packed_git has already been populated with this repository's
+        * packs.
+        */
+       unsigned packed_git_initialized : 1;
 };
 
 struct raw_object_store *raw_object_store_new(void);

diff --git a/packfile.c b/packfile.c
index 8b27b69bff26cab34bf67ad3e7f8a2b7c5f0a4b4..98162a051332f102762a49ad08c638e8a870ed7e 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -884,12 +884,11 @@ static void prepare_packed_git_mru(void)
                list_add_tail(&p->mru, &the_repository->objects->packed_git_mru);
 }
 
-static int prepare_packed_git_run_once = 0;
 void prepare_packed_git(void)
 {
        struct alternate_object_database *alt;
 
-       if (prepare_packed_git_run_once)
+       if (the_repository->objects->packed_git_initialized)
                return;
        prepare_packed_git_one(get_object_directory(), 1);
        prepare_alt_odb();
@@ -897,13 +896,13 @@ void prepare_packed_git(void)
                prepare_packed_git_one(alt->path, 0);
        rearrange_packed_git();
        prepare_packed_git_mru();
-       prepare_packed_git_run_once = 1;
+       the_repository->objects->packed_git_initialized = 1;
 }
 
 void reprepare_packed_git(void)
 {
        approximate_object_count_valid = 0;
-       prepare_packed_git_run_once = 0;
+       the_repository->objects->packed_git_initialized = 0;
        prepare_packed_git();
 }