[PATCH 5/8] t: honor default ref storage format
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Oct 27, 2026, 08:18 UTC
- Message-ID
- <20261027-b4-pks-ci-test-vars-consolidation-v1-5-f28edf79bd6c@pks.im>
- In-Reply-To
- <20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im>
When running with breaking changes enabled then we will also run tests with the SHA256 object hash by default, unless explicitly overridden. But we don't do the same for ref storage format and will continue to run tests with the "files" backend even though "reftables" are going to be the default backend there.
Adapt the logic to also use the compiled-in default ref storage backend for running our tests. Like this we'll now exercise the "reftable" backend when breaking changes are enabled.
This of course also applies to our CI jobs, where jobs exercising breaking changes will run now with both SHA256 and reftables. This renders the explicit "linux-reftable-sha256" job obsolete. Drop it.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- .github/workflows/main.yml | 3 --- .gitlab-ci.yml | 3 --- t/test-lib-functions.sh | 2 +- t/test-lib.sh | 4 +++- 4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe8155772ab..4353af2354e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -405,9 +405,6 @@ jobs: - jobname: linux-sha256 image: ubuntu:rolling cc: clang - - jobname: linux-reftable-sha256 - image: ubuntu:rolling - cc: clang - jobname: linux-feature-testbed image: ubuntu:latest - jobname: linux-breaking-changes diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b7698a0037..52c26f72671 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,9 +39,6 @@ test:linux: - jobname: linux-sha256 image: ubuntu:rolling CC: clang - - jobname: linux-reftable-sha256 - image: ubuntu:rolling - CC: clang - jobname: linux-feature-testbed image: ubuntu:latest - jobname: linux-breaking-changes diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 09a41d51adc..6f319cd54ba 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1737,7 +1737,7 @@ test_detect_hash () { # Detect the ref format in use. test_detect_ref_format () { - echo "${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-files}" + echo "${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-$GIT_TEST_BUILTIN_REF_STORAGE_FORMAT}" } # Load common hash metadata and common placeholder object IDs for use with diff --git a/t/test-lib.sh b/t/test-lib.sh index a893963f86c..de566309861 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -576,7 +576,9 @@ export EDITOR GIT_TEST_BUILTIN_HASH=$("$GIT_BINARY" version --build-options | sed -ne 's/^default-hash: //p') GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-$GIT_TEST_BUILTIN_HASH}" export GIT_DEFAULT_HASH -GIT_DEFAULT_REF_STORAGE_FORMAT="${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-files}" + +GIT_TEST_BUILTIN_REF_STORAGE_FORMAT=$("$GIT_BINARY" version --build-options | sed -ne 's/^default-ref-storage-format: //p') +GIT_DEFAULT_REF_STORAGE_FORMAT="${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-$GIT_TEST_BUILTIN_REF_STORAGE_FORMAT}" export GIT_DEFAULT_REF_STORAGE_FORMAT # Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output
-- 2.56.0.341.g393f52fd96.dirty