From: Patrick Steinhardt Date: Tue, 27 Oct 2026 06:59:28 GMT Subject: [PATCH v4 4/7] builtin: expose the object storage format Message-ID: <20261027-b4-pks-odb-extension-v4-4-5d28ca0ea1dc@pks.im> In-Reply-To: <20261027-b4-pks-odb-extension-v4-0-5d28ca0ea1dc@pks.im> The ref storage format of a repository can be inspected via both git-rev-parse(1)'s "--show-ref-storage-format" and git-repo(1)'s "references.storageFormat" field. Introduce the equivalent options for the object storage format, as well. Signed-off-by: Patrick Steinhardt --- Documentation/git-repo.adoc | 6 ++++++ Documentation/git-rev-parse.adoc | 5 +++++ builtin/repo.c | 10 ++++++++++ builtin/rev-parse.c | 9 +++++++++ odb.c | 7 +++++++ odb.h | 1 + t/t0001-init.sh | 5 ++++- t/t1900-repo-info.sh | 3 +++ 8 files changed, 45 insertions(+), 1 deletion(-) diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc index cb8c1e72927..d2dc9b7a69b 100644 --- a/Documentation/git-repo.adoc +++ b/Documentation/git-repo.adoc @@ -105,6 +105,12 @@ values that they return: `object.format`:: The object format (hash algorithm) used in the repository. +`objects.storageFormat`:: + The object storage format used in the repository, as configured via + `extensions.objectStorage`. The valid values are: ++ +include::object-storage-format.adoc[] + `path.commondir.absolute`:: The canonical absolute path to the Git repository's common directory (the shared `.git` directory containing objects, diff --git a/Documentation/git-rev-parse.adoc b/Documentation/git-rev-parse.adoc index 5b866af66a1..9103d54d53d 100644 --- a/Documentation/git-rev-parse.adoc +++ b/Documentation/git-rev-parse.adoc @@ -338,6 +338,11 @@ The following options are unaffected by `--path-format`: --show-ref-format:: Deprecated alias of `--show-ref-storage-format`. +--show-object-storage-format:: + Show the object storage format used for the repository. Prints the + value of `extensions.objectStorage`, or `files` when the extension is + not set. + Other Options ~~~~~~~~~~~~~ diff --git a/builtin/repo.c b/builtin/repo.c index 84e012f83f6..b73dff898f1 100644 --- a/builtin/repo.c +++ b/builtin/repo.c @@ -128,11 +128,21 @@ static int get_references_format(struct repository *repo, struct strbuf *buf) return 0; } +static int get_object_storage_format(struct repository *repo, struct strbuf *buf) +{ + strbuf_addstr(buf, + object_storage_format_to_name(repo->object_storage_format)); + if (repo->object_storage_payload) + strbuf_addf(buf, "://%s", repo->object_storage_payload); + return 0; +} + /* repo_info_field keys must be in lexicographical order */ static const struct repo_info_field repo_info_field[] = { { "layout.bare", get_layout_bare }, { "layout.shallow", get_layout_shallow }, { "object.format", get_object_format }, + { "objects.storageFormat", get_object_storage_format }, { "path.commondir.absolute", get_path_commondir_absolute }, { "path.commondir.relative", get_path_commondir_relative }, { "path.gitdir.absolute", get_path_gitdir_absolute }, diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index ec33c19bdfc..d2154eac8d2 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -17,6 +17,7 @@ #include "gettext.h" #include "hash.h" #include "hex.h" +#include "odb.h" #include "refs.h" #include "quote.h" #include "object-name.h" @@ -1138,6 +1139,14 @@ int cmd_rev_parse(int argc, puts(ref_storage_format_to_name(the_repository->ref_storage_format)); continue; } + if (!strcmp(arg, "--show-object-storage-format")) { + const char *format = object_storage_format_to_name(the_repository->object_storage_format); + if (the_repository->object_storage_payload) + printf("%s://%s\n", format, the_repository->object_storage_payload); + else + puts(format); + continue; + } if (!strcmp(arg, "--end-of-options")) { seen_end_of_options = 1; if (filter & (DO_FLAGS | DO_REVS)) diff --git a/odb.c b/odb.c index 0649622bc6f..a0866e6c889 100644 --- a/odb.c +++ b/odb.c @@ -40,6 +40,13 @@ enum object_storage_format object_storage_format_by_name(const char *name) return OBJECT_STORAGE_FORMAT_UNKNOWN; } +const char *object_storage_format_to_name(enum object_storage_format format) +{ + if (format < 0 || format >= ARRAY_SIZE(object_storage_name_by_format)) + format = OBJECT_STORAGE_FORMAT_UNKNOWN; + return object_storage_name_by_format[format]; +} + enum object_storage_format object_storage_format_by_uri(const char *uri, char **payload) { enum object_storage_format format; diff --git a/odb.h b/odb.h index cb0505334a4..1340f606327 100644 --- a/odb.h +++ b/odb.h @@ -37,6 +37,7 @@ char *compute_alternate_path(const char *path, struct strbuf *err); enum object_storage_format object_storage_format_by_uri(const char *uri, char **payload); enum object_storage_format object_storage_format_by_name(const char *name); +const char *object_storage_format_to_name(enum object_storage_format format); /* * The object database encapsulates access to objects in a repository. It diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 5e7c25e42cc..d080ab04a82 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -853,7 +853,10 @@ test_expect_success DEFAULT_REPO_FORMAT 'extensions.objectStorage with files bac git -C objstorage config set core.repositoryformatversion 1 && git -C objstorage config set extensions.objectStorage files && test_commit -C objstorage A && - git -C objstorage rev-parse --verify HEAD + git -C objstorage rev-parse --verify HEAD && + echo files >expect && + git -C objstorage rev-parse --show-object-storage-format >actual && + test_cmp expect actual ' test_expect_success DEFAULT_REPO_FORMAT 'extensions.objectStorage with unknown backend' ' diff --git a/t/t1900-repo-info.sh b/t/t1900-repo-info.sh index d115d2d9f98..493a78f2302 100755 --- a/t/t1900-repo-info.sh +++ b/t/t1900-repo-info.sh @@ -69,6 +69,9 @@ test_repo_info 'object.format = sha1 is retrieved correctly' \ test_repo_info 'object.format = sha256 is retrieved correctly' \ 'git init --object-format=sha256' 'sha256' 'object.format' 'sha256' +test_repo_info 'objects.storageFormat = files is retrieved correctly' \ + 'git init' 'objects-files' 'objects.storageFormat' 'files' + test_expect_success 'values returned in order requested' ' cat >expect <<-\EOF && layout.bare=false -- 2.56.0.341.g393f52fd96.dirty