[PATCH 3/7] setup: allow overriding object storage format via environment
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Oct 19, 2026, 08:55 UTC
- Message-ID
- <20261019-b4-pks-odb-extension-v1-3-143a5963b77f@pks.im>
- In-Reply-To
- <20261019-b4-pks-odb-extension-v1-0-143a5963b77f@pks.im>
The ref storage format configured via "extensions.refStorage" can be overridden with the GIT_REF_STORAGE_FORMAT environment variable. Introduce the GIT_OBJECT_STORAGE_FORMAT environment variable that overrides "extensions.objectStorage" in the same way.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- Documentation/git.adoc | 5 +++++ environment.h | 1 + setup.c | 14 ++++++++++++++ t/t0001-init.sh | 26 ++++++++++++++++++++++++++ 4 files changed, 46 insertions(+)
diff --git a/Documentation/git.adoc b/Documentation/git.adoc index 3abb4701c3..34812131bb 100644 --- a/Documentation/git.adoc +++ b/Documentation/git.adoc @@ -609,6 +609,11 @@ double-quotes and respecting backslash escapes. E.g., the value `GIT_REFERENCE_BACKEND`:: Deprecated alias of `GIT_REF_STORAGE_FORMAT`. +`GIT_OBJECT_STORAGE_FORMAT`:: + Specify which object storage format to use along with its URI. + See `extensions.objectStorage` option in linkgit:git-config[1] for more + details. Overrides the config variable when used. + Git Commits ~~~~~~~~~~~ `GIT_AUTHOR_NAME`:: diff --git a/environment.h b/environment.h index b336459e90..c26ef92b52 100644 --- a/environment.h +++ b/environment.h @@ -45,6 +45,7 @@ #define GIT_ATTR_SOURCE_ENVIRONMENT "GIT_ATTR_SOURCE" #define GIT_REFERENCE_BACKEND_ENVIRONMENT "GIT_REFERENCE_BACKEND" #define GIT_REF_STORAGE_FORMAT_ENVIRONMENT "GIT_REF_STORAGE_FORMAT" +#define GIT_OBJECT_STORAGE_FORMAT_ENVIRONMENT "GIT_OBJECT_STORAGE_FORMAT" /* * Environment variable used to propagate the --no-advice global option to the diff --git a/setup.c b/setup.c index 499b5bbe3c..98140a7641 100644 --- a/setup.c +++ b/setup.c @@ -2073,6 +2073,7 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok) if (startup_info->have_repository) { struct strbuf err = STRBUF_INIT; + const char *object_storage_uri; const char *ref_backend_uri; /* @@ -2091,6 +2092,19 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok) die(_("unknown ref storage format: '%s'"), ref_backend_uri); } + /* + * Likewise, the GIT_OBJECT_STORAGE_FORMAT environment + * variable should override the repository config for + * 'extensions.objectStorage'. + */ + object_storage_uri = getenv(GIT_OBJECT_STORAGE_FORMAT_ENVIRONMENT); + if (object_storage_uri) { + if (odb_source_type_by_uri(object_storage_uri, NULL) == ODB_SOURCE_UNKNOWN) + die(_("unknown object storage format: '%s'"), object_storage_uri); + free(discovery.format.object_storage); + discovery.format.object_storage = xstrdup(object_storage_uri); + } + if (apply_repository_format(repo, &discovery.format, APPLY_REPOSITORY_FORMAT_HONOR_ENV, &err) < 0) die("%s", err.buf); diff --git a/t/t0001-init.sh b/t/t0001-init.sh index c7c464d3a2..5e7c25e42c 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -869,6 +869,32 @@ test_expect_success DEFAULT_REPO_FORMAT 'extensions.objectStorage with unknown b test_grep "invalid value for ${SQ}extensions.objectstorage${SQ}: ${SQ}garbage://payload${SQ}" err ' +test_expect_success DEFAULT_REPO_FORMAT 'GIT_OBJECT_STORAGE_FORMAT overrides extensions.objectStorage' ' + test_when_finished "rm -rf objstorage" && + git init objstorage && + ( + cd objstorage && + git config set core.repositoryformatversion 1 && + git config set extensions.objectStorage files://objs && + mkdir .git/objs .git/other && + + echo content >file && + oid=$(git hash-object -w file) && + test_path_is_file .git/objs/$(test_oid_to_path "$oid") && + git cat-file -e "$oid" && + + test_must_fail env GIT_OBJECT_STORAGE_FORMAT=files://other git cat-file -e "$oid" && + GIT_OBJECT_STORAGE_FORMAT=files://other git hash-object -w file && + test_path_is_file .git/other/$(test_oid_to_path "$oid") && + + cat >expect <<-EOF && + fatal: unknown object storage format: ${SQ}garbage${SQ} + EOF + test_must_fail env GIT_OBJECT_STORAGE_FORMAT=garbage git rev-parse 2>err && + test_cmp expect err + ) +' + test_expect_success MINGW 'core.hidedotfiles = false' ' git config --global core.hidedotfiles false && rm -rf newdir &&
-- 2.56.0.269.g68944adf51.dirty