diff options
| author | Jeff King <peff@peff.net> | 2018-11-12 17:48:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 08:22:02 +0300 |
| commit | 263db403face43927c2eb545a2e6ebb39aae4239 (patch) | |
| tree | e851206ef0d532f642a0ec5d70105d9f30f427a3 /object-store.h | |
| parent | b2ac148faecc95243ed8da0b75f63966d828c802 (diff) | |
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 'object-store.h')
| -rw-r--r-- | object-store.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/object-store.h b/object-store.h index 63b7605a3e..122d5f75e2 100644 --- a/object-store.h +++ b/object-store.h @@ -7,8 +7,8 @@ #include "sha1-array.h" #include "strbuf.h" -struct alternate_object_database { - struct alternate_object_database *next; +struct object_directory { + struct object_directory *next; /* see alt_scratch_buf() */ struct strbuf scratch; @@ -32,14 +32,14 @@ struct alternate_object_database { }; void prepare_alt_odb(struct repository *r); char *compute_alternate_path(const char *path, struct strbuf *err); -typedef int alt_odb_fn(struct alternate_object_database *, void *); +typedef int alt_odb_fn(struct object_directory *, void *); int foreach_alt_odb(alt_odb_fn, void*); /* * Allocate a "struct alternate_object_database" but do _not_ actually * add it to the list of alternates. */ -struct alternate_object_database *alloc_alt_odb(const char *dir); +struct object_directory *alloc_alt_odb(const char *dir); /* * Add the directory to the on-disk alternates file; the new entry will also @@ -60,7 +60,7 @@ void add_to_alternates_memory(const char *dir); * alternate. Always use this over direct access to alt->scratch, as it * cleans up any previous use of the scratch buffer. */ -struct strbuf *alt_scratch_buf(struct alternate_object_database *alt); +struct strbuf *alt_scratch_buf(struct object_directory *odb); struct packed_git { struct packed_git *next; @@ -100,8 +100,8 @@ struct raw_object_store { /* Path to extra alternate object database if not NULL */ char *alternate_db; - struct alternate_object_database *alt_odb_list; - struct alternate_object_database **alt_odb_tail; + struct object_directory *alt_odb_list; + struct object_directory **alt_odb_tail; /* * Objects that should be substituted by other objects |