summaryrefslogtreecommitdiff
path: root/packfile.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-03-23 17:45:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-26 17:07:43 (GMT)
commit464416a2eaadf84d2bfdf795007863d03b222b7c (patch)
treed6171bac0e528aad6224c78e20e647a487e236a3 /packfile.c
parent0a0dd632aa9c9bcdb1b79a7fc4cf6dc161760020 (diff)
downloadgit-464416a2eaadf84d2bfdf795007863d03b222b7c.zip
git-464416a2eaadf84d2bfdf795007863d03b222b7c.tar.gz
git-464416a2eaadf84d2bfdf795007863d03b222b7c.tar.bz2
packfile: keep prepare_packed_git() private
The reason callers have to call this is to make sure either packed_git or packed_git_mru pointers are initialized since we don't do that by default. Sometimes it's hard to see this connection between where the function is called and where packed_git pointer is used (sometimes in separate functions). Keep this dependency internal because now all access to packed_git and packed_git_mru must go through get_xxx() wrappers. 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 'packfile.c')
-rw-r--r--packfile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/packfile.c b/packfile.c
index 5d4c8d6..0906b8f 100644
--- a/packfile.c
+++ b/packfile.c
@@ -803,6 +803,7 @@ static void prepare_packed_git_one(struct repository *r, char *objdir, int local
strbuf_release(&path);
}
+static void prepare_packed_git(struct repository *r);
/*
* Give a fast, rough count of the number of objects in the repository. This
* ignores loose objects completely. If you have a lot of them, then either
@@ -883,7 +884,7 @@ static void prepare_packed_git_mru(struct repository *r)
list_add_tail(&p->mru, &r->objects->packed_git_mru);
}
-void prepare_packed_git(struct repository *r)
+static void prepare_packed_git(struct repository *r)
{
struct alternate_object_database *alt;
@@ -907,11 +908,13 @@ void reprepare_packed_git(struct repository *r)
struct packed_git *get_packed_git(struct repository *r)
{
+ prepare_packed_git(r);
return r->objects->packed_git;
}
struct list_head *get_packed_git_mru(struct repository *r)
{
+ prepare_packed_git(r);
return &r->objects->packed_git_mru;
}