summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-03-23 18:20:59 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-26 10:05:46 -0700
commita80d72db2a73174b3f22142eb2014b33696fd795 (patch)
tree1278f03e0783b80ab18a3cb5b680c4af3e1ef974 /sha1_name.c
parent97501e933a6d4d5a8567dbbb44fa3b4bff2ea298 (diff)
downloadgit-a80d72db2a73174b3f22142eb2014b33696fd795.tar.gz
object-store: move packed_git and packed_git_mru to object store
In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. [nd: while at there, wrap access to these two fields in get_packed_git() and get_packed_git_mru(). This allows us to lazily initialize these fields without caller doing that explicitly] 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>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c
index a22a29cda0..ffff7d8710 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -197,7 +197,8 @@ static void find_short_packed_object(struct disambiguate_state *ds)
struct packed_git *p;
prepare_packed_git();
- for (p = packed_git; p && !ds->ambiguous; p = p->next)
+ for (p = get_packed_git(the_repository); p && !ds->ambiguous;
+ p = p->next)
unique_in_pack(p, ds);
}
@@ -567,7 +568,7 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
struct packed_git *p;
prepare_packed_git();
- for (p = packed_git; p; p = p->next)
+ for (p = get_packed_git(the_repository); p; p = p->next)
find_abbrev_len_for_pack(p, mad);
}