mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
packfile: refactor install_packed_git() to work on packfile store
The `install_packed_git()` functions adds a packfile to a specific object store. Refactor it to accept a packfile store instead of a repository to clarify its scope. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
78237ea53d
commit
f6f236d926
11
packfile.c
11
packfile.c
@@ -779,16 +779,17 @@ struct packed_git *add_packed_git(struct repository *r, const char *path,
|
||||
return p;
|
||||
}
|
||||
|
||||
void install_packed_git(struct repository *r, struct packed_git *pack)
|
||||
void packfile_store_add_pack(struct packfile_store *store,
|
||||
struct packed_git *pack)
|
||||
{
|
||||
if (pack->pack_fd != -1)
|
||||
pack_open_fds++;
|
||||
|
||||
pack->next = r->objects->packfiles->packs;
|
||||
r->objects->packfiles->packs = pack;
|
||||
pack->next = store->packs;
|
||||
store->packs = pack;
|
||||
|
||||
hashmap_entry_init(&pack->packmap_ent, strhash(pack->pack_name));
|
||||
hashmap_add(&r->objects->packfiles->map, &pack->packmap_ent);
|
||||
hashmap_add(&store->map, &pack->packmap_ent);
|
||||
}
|
||||
|
||||
void (*report_garbage)(unsigned seen_bits, const char *path);
|
||||
@@ -904,7 +905,7 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
|
||||
if (!hashmap_get(&data->r->objects->packfiles->map, &hent, pack_name)) {
|
||||
p = add_packed_git(data->r, full_name, full_name_len, data->local);
|
||||
if (p)
|
||||
install_packed_git(data->r, p);
|
||||
packfile_store_add_pack(data->r->objects->packfiles, p);
|
||||
}
|
||||
free(pack_name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user