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 /commit-graph.c | |
| parent | submodule--helper: prefer strip_suffix() to ends_with() (diff) | |
| download | tgif-263db403face43927c2eb545a2e6ebb39aae4239.tar.xz | |
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 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/commit-graph.c b/commit-graph.c index 40c855f185..5dd3f5b15c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -230,7 +230,7 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir) */ static int prepare_commit_graph(struct repository *r) { - struct alternate_object_database *alt; + struct object_directory *odb; char *obj_dir; int config_value; @@ -255,10 +255,10 @@ static int prepare_commit_graph(struct repository *r) obj_dir = r->objects->objectdir; prepare_commit_graph_one(r, obj_dir); prepare_alt_odb(r); - for (alt = r->objects->alt_odb_list; - !r->objects->commit_graph && alt; - alt = alt->next) - prepare_commit_graph_one(r, alt->path); + for (odb = r->objects->alt_odb_list; + !r->objects->commit_graph && odb; + odb = odb->next) + prepare_commit_graph_one(r, odb->path); return !!r->objects->commit_graph; } |