From 263db403face43927c2eb545a2e6ebb39aae4239 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 12 Nov 2018 09:48:47 -0500 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/submodule--helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'builtin/submodule--helper.c') diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 28b9449e82..3ae451bc46 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1265,7 +1265,7 @@ struct submodule_alternate_setup { SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL } static int add_possible_reference_from_superproject( - struct alternate_object_database *alt, void *sas_cb) + struct object_directory *odb, void *sas_cb) { struct submodule_alternate_setup *sas = sas_cb; size_t len; @@ -1274,11 +1274,11 @@ static int add_possible_reference_from_superproject( * If the alternate object store is another repository, try the * standard layout with .git/(modules/)+/objects */ - if (strip_suffix(alt->path, "/objects", &len)) { + if (strip_suffix(odb->path, "/objects", &len)) { char *sm_alternate; struct strbuf sb = STRBUF_INIT; struct strbuf err = STRBUF_INIT; - strbuf_add(&sb, alt->path, len); + strbuf_add(&sb, odb->path, len); /* * We need to end the new path with '/' to mark it as a dir, -- cgit v1.3-5-g9baa