diff options
| author | Stefan Beller <sbeller@google.com> | 2018-03-23 18:21:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-26 10:05:55 -0700 |
| commit | 5508f69348ee1073666d3611a4a62ecdb0849e4e (patch) | |
| tree | b39742f2ce50ebb1f55eb366b819706eef51013d | |
| parent | d0b59866223f7ef0dcd07bff857f651cd921bc02 (diff) | |
| download | git-5508f69348ee1073666d3611a4a62ecdb0849e4e.tar.gz | |
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>
| -rw-r--r-- | object-store.h | 6 | ||||
| -rw-r--r-- | packfile.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/object-store.h b/object-store.h index c687ab7587..6a07a14d63 100644 --- 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 8b27b69bff..98162a0513 100644 --- 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(); } |