rename "alternate_object_database" to "object_directory"
In preparation for unifying the handling of alt odb's and the normal repo object directory, let's use a more neutral name. This patch is purely mechanical, swapping the type name, and converting any variables named "alt" to "odb". There should be no functional change, but it will reduce the noise in subsequent diffs. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
b2ac148fae
commit
263db403fa
@ -966,16 +966,16 @@ static void prepare_packed_git_mru(struct repository *r)
|
||||
|
||||
static void prepare_packed_git(struct repository *r)
|
||||
{
|
||||
struct alternate_object_database *alt;
|
||||
struct object_directory *odb;
|
||||
|
||||
if (r->objects->packed_git_initialized)
|
||||
return;
|
||||
prepare_multi_pack_index_one(r, r->objects->objectdir, 1);
|
||||
prepare_packed_git_one(r, r->objects->objectdir, 1);
|
||||
prepare_alt_odb(r);
|
||||
for (alt = r->objects->alt_odb_list; alt; alt = alt->next) {
|
||||
prepare_multi_pack_index_one(r, alt->path, 0);
|
||||
prepare_packed_git_one(r, alt->path, 0);
|
||||
for (odb = r->objects->alt_odb_list; odb; odb = odb->next) {
|
||||
prepare_multi_pack_index_one(r, odb->path, 0);
|
||||
prepare_packed_git_one(r, odb->path, 0);
|
||||
}
|
||||
rearrange_packed_git(r);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user