summaryrefslogtreecommitdiff
path: root/packfile.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-11-12 14:48:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-13 05:22:02 (GMT)
commit263db403face43927c2eb545a2e6ebb39aae4239 (patch)
treee851206ef0d532f642a0ec5d70105d9f30f427a3 /packfile.c
parentb2ac148faecc95243ed8da0b75f63966d828c802 (diff)
downloadgit-263db403face43927c2eb545a2e6ebb39aae4239.zip
git-263db403face43927c2eb545a2e6ebb39aae4239.tar.gz
git-263db403face43927c2eb545a2e6ebb39aae4239.tar.bz2
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>
Diffstat (limited to 'packfile.c')
-rw-r--r--packfile.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/packfile.c b/packfile.c
index f2850a0..d6d511c 100644
--- a/packfile.c
+++ b/packfile.c
@@ -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);