diff options
| author | Jeff King <peff@peff.net> | 2018-11-12 09:48:47 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 14:22:02 +0900 |
| commit | 263db403face43927c2eb545a2e6ebb39aae4239 (patch) | |
| tree | e851206ef0d532f642a0ec5d70105d9f30f427a3 /packfile.c | |
| parent | b2ac148faecc95243ed8da0b75f63966d828c802 (diff) | |
| download | git-263db403face43927c2eb545a2e6ebb39aae4239.tar.gz | |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packfile.c b/packfile.c index f2850a00b5..d6d511cfd2 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); |