{"thread":{"id":"66676","subject":"[PATCH 0/8] ci: consolidate test variables","startedAt":"2026-10-27T08:18:20Z","lastAt":"2026-11-04T18:32:05Z","messageCount":32,"participants":["Patrick Steinhardt","Phillip Wood","Junio C Hamano","Jeff King","Toon Claes"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"556438","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":null,"subject":"[PATCH 0/8] ci: consolidate test variables","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:20Z","receivedAt":"2026-10-27T08:18:20Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"Hi,\n\nthis patch series consolidates our test variables as a follow up on the\ndiscussions in [1].\n\nThe series is built on top of 37b3475fb53 (The 9th batch, 2026-10-25).\n\nThanks!\n\nPatrick\n\n[1]: <20261008-pks-ci-housekeeping-v1-0-baf015c589c0@pks.im>\n\n---\nPatrick Steinhardt (8):\n      ci: consolidate setup of test environment\n      ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs\n      ci/lib: deduplicate test variables by pattern matching\n      ci/lib: merge switches for specific job names\n      t: honor default ref storage format\n      ci/lib: add another NO_RUST build using glibc\n      ci: don't override initial branch name in testbed job\n      t/test-lib: make feature-testbed job more accessible\n\n .github/workflows/main.yml |  3 ---\n .gitlab-ci.yml             |  3 ---\n ci/lib.sh                  | 34 ++++++++++++++++++++++++++++++++--\n ci/run-build-and-tests.sh  | 44 --------------------------------------------\n t/README                   |  5 +++++\n t/test-lib-functions.sh    |  2 +-\n t/test-lib.sh              | 25 ++++++++++++++++++++++++-\n t/unit-tests/unit-test.c   |  1 +\n 8 files changed, 63 insertions(+), 54 deletions(-)\n\n\n---\nbase-commit: 37b3475fb530c14109211faca33716a173db61ed\nchange-id: 20261016-b4-pks-ci-test-vars-consolidation-8d0c6a53ca28\n\n\n"},{"id":"556439","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-1-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 1/8] ci: consolidate setup of test environment","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:21Z","receivedAt":"2026-10-27T08:18:21Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"The setup of our test environment is split up across \"ci/lib.sh\" and\n\"ci/run-build-and-tests.sh\". It is not exactly obvious why that split\neven exists, and because of the split you have to know about both of the\nlocations to be able to figure out the specific environment that applies\nto a specific job.\n\nConsolidate the setup into \"ci/lib.sh\". Note that this is a pure move\nfor now that results in some awkward duplication. This duplication will\nbe cleaned up in subsequent commits.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh                 | 43 +++++++++++++++++++++++++++++++++++++++++++\n ci/run-build-and-tests.sh | 44 --------------------------------------------\n 2 files changed, 43 insertions(+), 44 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 2e63d652543..d0bd8113d35 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -394,7 +394,50 @@ osx-meson)\n \t;;\n esac\n \n+case \"$jobname\" in\n+linux-musl-meson)\n+\tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n+\texport GIT_TEST_USE_SET_E=yes\n+\t;;\n+almalinux-*|debian-*|fedora-*|linux-*)\n+\texport GIT_TEST_USE_SET_E=yes\n+\t;;\n+esac\n+\n+case \"$jobname\" in\n+fedora-breaking-changes-meson|linux-breaking-changes)\n+\texport WITH_BREAKING_CHANGES=YesPlease\n+\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n+\t;;\n+linux-feature-testbed)\n+\texport OPENSSL_SHA1_UNSAFE=YesPlease\n+\texport GIT_TEST_SPLIT_INDEX=yes\n+\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n+\texport GIT_TEST_OE_SIZE=10\n+\texport GIT_TEST_OE_DELTA_SIZE=5\n+\texport GIT_TEST_COMMIT_GRAPH=1\n+\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n+\texport GIT_TEST_MULTI_PACK_INDEX=1\n+\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n+\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n+\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n+\texport GIT_TEST_CHECKOUT_WORKERS=2\n+\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n+\t;;\n+linux-sha256)\n+\texport GIT_TEST_DEFAULT_HASH=sha256\n+\t;;\n+linux-reftable-sha256)\n+\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n+\texport GIT_TEST_DEFAULT_HASH=sha256\n+\t;;\n+linux-reftable-leaks|osx-reftable)\n+\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n+\t;;\n+esac\n+\n MAKEFLAGS=\"$MAKEFLAGS CC=${CC:-cc}\"\n+export TEST_CONTRIB_TOO=yes\n \n end_group \"CI setup via $(basename $0)\"\n set -x\ndiff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh\nindex 68b91e31439..b81d654b561 100755\n--- a/ci/run-build-and-tests.sh\n+++ b/ci/run-build-and-tests.sh\n@@ -5,50 +5,6 @@\n \n . ${0%/*}/lib.sh\n \n-export TEST_CONTRIB_TOO=yes\n-\n-case \"$jobname\" in\n-linux-musl-meson)\n-\tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n-\texport GIT_TEST_USE_SET_E=yes\n-\t;;\n-almalinux-*|debian-*|fedora-*|linux-*)\n-\texport GIT_TEST_USE_SET_E=yes\n-\t;;\n-esac\n-\n-case \"$jobname\" in\n-fedora-breaking-changes-meson|linux-breaking-changes)\n-\texport WITH_BREAKING_CHANGES=YesPlease\n-\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n-\t;;\n-linux-feature-testbed)\n-\texport OPENSSL_SHA1_UNSAFE=YesPlease\n-\texport GIT_TEST_SPLIT_INDEX=yes\n-\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n-\texport GIT_TEST_OE_SIZE=10\n-\texport GIT_TEST_OE_DELTA_SIZE=5\n-\texport GIT_TEST_COMMIT_GRAPH=1\n-\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n-\texport GIT_TEST_MULTI_PACK_INDEX=1\n-\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n-\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n-\texport GIT_TEST_CHECKOUT_WORKERS=2\n-\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n-\t;;\n-linux-sha256)\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-sha256)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-leaks|osx-reftable)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\t;;\n-esac\n-\n case \"$jobname\" in\n *-meson)\n \tgroup \"Configure\" meson setup build . \\\n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556440","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-2-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 2/8] ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:22Z","receivedAt":"2026-10-27T08:18:22Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"The GIT_TEST_USE_SET_E test variable determines whether we run our test\nsuite with `set -e` enabled or not. This works on all of our supported\nLinux distributions, but it doesn't work on macOS because the version of\nBash used there is rather old and thus has some differences in\nbehaviour.\n\nWe currently set that variable for a bunch of distros explicitly, which\nis tedious to keep up-to-date. For example, our \"linux32\" job does not\nenable the test variable even though it could. Adapt the script to\ninstead set it on any Linux distribution.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 10 ++++++----\n 1 file changed, 6 insertions(+), 4 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex d0bd8113d35..560d785f67c 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -367,6 +367,12 @@ esac\n CUSTOM_PATH=\"${CUSTOM_PATH:-$HOME/path}\"\n export PATH=\"$CUSTOM_PATH:$PATH\"\n \n+case \"$CI_OS_NAME\" in\n+linux)\n+\texport GIT_TEST_USE_SET_E=yes\n+\t;;\n+esac\n+\n case \"$jobname\" in\n linux32)\n \tCC=gcc\n@@ -397,10 +403,6 @@ esac\n case \"$jobname\" in\n linux-musl-meson)\n \tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n-\texport GIT_TEST_USE_SET_E=yes\n-\t;;\n-almalinux-*|debian-*|fedora-*|linux-*)\n-\texport GIT_TEST_USE_SET_E=yes\n \t;;\n esac\n \n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556441","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-3-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 3/8] ci/lib: deduplicate test variables by pattern matching","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:23Z","receivedAt":"2026-10-27T08:18:23Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"We have a couple of test variables that we set in multiple different\njobs. These jobs always have specific identifiers in their names and can\nthus easily be told apart from the other jobs.\n\nUse this fact to deduplicate the setup of those test variables by\npattern matching for those identifiers.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 33 +++++++++++++++++++--------------\n 1 file changed, 19 insertions(+), 14 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 560d785f67c..de4b94d4d33 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -373,6 +373,25 @@ linux)\n \t;;\n esac\n \n+case \"$jobname\" in\n+*breaking-changes*)\n+\texport WITH_BREAKING_CHANGES=YesPlease\n+\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n+\t;;\n+esac\n+\n+case \"$jobname\" in\n+*reftable*)\n+\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n+\t;;\n+esac\n+\n+case \"$jobname\" in\n+*sha256*)\n+\texport GIT_TEST_DEFAULT_HASH=sha256\n+\t;;\n+esac\n+\n case \"$jobname\" in\n linux32)\n \tCC=gcc\n@@ -407,10 +426,6 @@ linux-musl-meson)\n esac\n \n case \"$jobname\" in\n-fedora-breaking-changes-meson|linux-breaking-changes)\n-\texport WITH_BREAKING_CHANGES=YesPlease\n-\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n-\t;;\n linux-feature-testbed)\n \texport OPENSSL_SHA1_UNSAFE=YesPlease\n \texport GIT_TEST_SPLIT_INDEX=yes\n@@ -426,16 +441,6 @@ linux-feature-testbed)\n \texport GIT_TEST_CHECKOUT_WORKERS=2\n \texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n \t;;\n-linux-sha256)\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-sha256)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-leaks|osx-reftable)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\t;;\n esac\n \n MAKEFLAGS=\"$MAKEFLAGS CC=${CC:-cc}\"\n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556442","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-4-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 4/8] ci/lib: merge switches for specific job names","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:24Z","receivedAt":"2026-10-27T08:18:24Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"With the preceding consolidations of test variables we now pointlessly\nhave three switches over \"$jobname\". Merge them into a single switch.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 41 ++++++++++++++++-------------------------\n 1 file changed, 16 insertions(+), 25 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex de4b94d4d33..7f67a95cdcc 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -396,11 +396,26 @@ case \"$jobname\" in\n linux32)\n \tCC=gcc\n \t;;\n+linux-feature-testbed)\n+\texport OPENSSL_SHA1_UNSAFE=YesPlease\n+\texport GIT_TEST_SPLIT_INDEX=yes\n+\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n+\texport GIT_TEST_OE_SIZE=10\n+\texport GIT_TEST_OE_DELTA_SIZE=5\n+\texport GIT_TEST_COMMIT_GRAPH=1\n+\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n+\texport GIT_TEST_MULTI_PACK_INDEX=1\n+\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n+\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n+\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n+\texport GIT_TEST_CHECKOUT_WORKERS=2\n+\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n+\t;;\n linux-meson)\n \tMESONFLAGS=\"$MESONFLAGS -Dcredential_helpers=libsecret,netrc\"\n \t;;\n linux-musl-meson)\n-\tMESONFLAGS=\"$MESONFLAGS -Dtest_utf8_locale=C.UTF-8\"\n+\tMESONFLAGS=\"$MESONFLAGS -Dtest_utf8_locale=C.UTF-8 -Drust=disabled\"\n \t;;\n linux-leaks|linux-reftable-leaks)\n \texport SANITIZE=leak\n@@ -419,30 +434,6 @@ osx-meson)\n \t;;\n esac\n \n-case \"$jobname\" in\n-linux-musl-meson)\n-\tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n-\t;;\n-esac\n-\n-case \"$jobname\" in\n-linux-feature-testbed)\n-\texport OPENSSL_SHA1_UNSAFE=YesPlease\n-\texport GIT_TEST_SPLIT_INDEX=yes\n-\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n-\texport GIT_TEST_OE_SIZE=10\n-\texport GIT_TEST_OE_DELTA_SIZE=5\n-\texport GIT_TEST_COMMIT_GRAPH=1\n-\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n-\texport GIT_TEST_MULTI_PACK_INDEX=1\n-\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n-\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n-\texport GIT_TEST_CHECKOUT_WORKERS=2\n-\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n-\t;;\n-esac\n-\n MAKEFLAGS=\"$MAKEFLAGS CC=${CC:-cc}\"\n export TEST_CONTRIB_TOO=yes\n \n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556443","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-5-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 5/8] t: honor default ref storage format","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:25Z","receivedAt":"2026-10-27T08:18:25Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"When running with breaking changes enabled then we will also run tests\nwith the SHA256 object hash by default, unless explicitly overridden.\nBut we don't do the same for ref storage format and will continue to run\ntests with the \"files\" backend even though \"reftables\" are going to be\nthe default backend there.\n\nAdapt the logic to also use the compiled-in default ref storage backend\nfor running our tests. Like this we'll now exercise the \"reftable\"\nbackend when breaking changes are enabled.\n\nThis of course also applies to our CI jobs, where jobs exercising\nbreaking changes will run now with both SHA256 and reftables. This\nrenders the explicit \"linux-reftable-sha256\" job obsolete. Drop it.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n .github/workflows/main.yml | 3 ---\n .gitlab-ci.yml             | 3 ---\n t/test-lib-functions.sh    | 2 +-\n t/test-lib.sh              | 4 +++-\n 4 files changed, 4 insertions(+), 8 deletions(-)\n\ndiff --git a/.github/workflows/main.yml b/.github/workflows/main.yml\nindex fe8155772ab..4353af2354e 100644\n--- a/.github/workflows/main.yml\n+++ b/.github/workflows/main.yml\n@@ -405,9 +405,6 @@ jobs:\n         - jobname: linux-sha256\n           image: ubuntu:rolling\n           cc: clang\n-        - jobname: linux-reftable-sha256\n-          image: ubuntu:rolling\n-          cc: clang\n         - jobname: linux-feature-testbed\n           image: ubuntu:latest\n         - jobname: linux-breaking-changes\ndiff --git a/.gitlab-ci.yml b/.gitlab-ci.yml\nindex 9b7698a0037..52c26f72671 100644\n--- a/.gitlab-ci.yml\n+++ b/.gitlab-ci.yml\n@@ -39,9 +39,6 @@ test:linux:\n       - jobname: linux-sha256\n         image: ubuntu:rolling\n         CC: clang\n-      - jobname: linux-reftable-sha256\n-        image: ubuntu:rolling\n-        CC: clang\n       - jobname: linux-feature-testbed\n         image: ubuntu:latest\n       - jobname: linux-breaking-changes\ndiff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh\nindex 09a41d51adc..6f319cd54ba 100644\n--- a/t/test-lib-functions.sh\n+++ b/t/test-lib-functions.sh\n@@ -1737,7 +1737,7 @@ test_detect_hash () {\n \n # Detect the ref format in use.\n test_detect_ref_format () {\n-\techo \"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-files}\"\n+\techo \"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-$GIT_TEST_BUILTIN_REF_STORAGE_FORMAT}\"\n }\n \n # Load common hash metadata and common placeholder object IDs for use with\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex a893963f86c..de566309861 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -576,7 +576,9 @@ export EDITOR\n GIT_TEST_BUILTIN_HASH=$(\"$GIT_BINARY\" version --build-options | sed -ne 's/^default-hash: //p')\n GIT_DEFAULT_HASH=\"${GIT_TEST_DEFAULT_HASH:-$GIT_TEST_BUILTIN_HASH}\"\n export GIT_DEFAULT_HASH\n-GIT_DEFAULT_REF_STORAGE_FORMAT=\"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-files}\"\n+\n+GIT_TEST_BUILTIN_REF_STORAGE_FORMAT=$(\"$GIT_BINARY\" version --build-options | sed -ne 's/^default-ref-storage-format: //p')\n+GIT_DEFAULT_REF_STORAGE_FORMAT=\"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-$GIT_TEST_BUILTIN_REF_STORAGE_FORMAT}\"\n export GIT_DEFAULT_REF_STORAGE_FORMAT\n \n # Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output\n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556444","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-6-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 6/8] ci/lib: add another NO_RUST build using glibc","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:26Z","receivedAt":"2026-10-27T08:18:26Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"With 32d5b90590 (Enable Rust by default, 2026-04-09) we have enabled\nRust by default. As part of that change we also lost test coverage of\nnon-Rust builds, as the only platform where we still exercise without\nRust is on Alpine Linux with musl libc.\n\nAdapt the \"linux-asan-ubsan\" job to disable Rust to restore some of that\ncoverage. This job was chosen because we also get more bang for the buck\nchecking for memory safety issues in a job where we use C instead of\nRust, as Rust is supposedly memory-safe by itself already.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 7f67a95cdcc..82bc169ed7a 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -427,7 +427,7 @@ linux-leaks|linux-reftable-leaks)\n linux-asan-ubsan)\n \texport SANITIZE=address,undefined\n \texport NO_SVN_TESTS=LetsSaveSomeTime\n-\tMAKEFLAGS=\"$MAKEFLAGS NO_PYTHON=YepBecauseP4FlakesTooOften\"\n+\tMAKEFLAGS=\"$MAKEFLAGS NO_PYTHON=YepBecauseP4FlakesTooOften NO_RUST=Yes\"\n \t;;\n osx-meson)\n \tMESONFLAGS=\"$MESONFLAGS -Dcredential_helpers=osxkeychain\"\n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556445","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-7-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 7/8] ci: don't override initial branch name in testbed job","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:27Z","receivedAt":"2026-10-27T08:18:27Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"The testbed job overrides GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME to\n\"master\". This is rather pointless nowadays though, as we already\nconfigure the initial branch name to either \"main\" or \"master\" depending\non the \"WITH_BREAKING_CHANGES\" toggle.\n\nDrop this override.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 82bc169ed7a..fbb13ca6c6a 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -406,7 +406,6 @@ linux-feature-testbed)\n \texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n \texport GIT_TEST_MULTI_PACK_INDEX=1\n \texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n-\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n \texport GIT_TEST_NO_WRITE_REV_INDEX=1\n \texport GIT_TEST_CHECKOUT_WORKERS=2\n \texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556446","messageId":"20261027-b4-pks-ci-test-vars-consolidation-v1-8-f28edf79bd6c@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-27T08:18:28Z","receivedAt":"2026-10-27T08:18:28Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"Our \"feature-testbed\" job sets up a bunch of GIT_TEST environment\nvariables and then executes our tests. This is mostly intended as a\ntestbed for features that aren't default-enabled, but that may\neventually become so.\n\nDue to the job being special it has a higher potential of failing even\nthough a local test run succeeds. But running these tests locally with\nthe same environment is somewhat painful, as the developer has to\nmanually set all of these environment variables.\n\nIntroduce a new \"--feature-testbed\" toggle for our test suite that, when\nset, sets up exactly these environment variables. Migrate our CI to use\nthis toggle so that we have a single source of truth, only.\n\nNote that we only set these GIT_TEST variables in the case where they\nhaven't already been configured. This serves two purposes:\n\n  - The user can continue to manually override a subset of those\n    variables, if they desire.\n\n  - Test scripts typically source \"t/test-lib.sh\" after they already\n    overrode GIT_TEST variables, and we don't want to discard that.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh                | 12 +-----------\n t/README                 |  5 +++++\n t/test-lib.sh            | 21 +++++++++++++++++++++\n t/unit-tests/unit-test.c |  1 +\n 4 files changed, 28 insertions(+), 11 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex fbb13ca6c6a..c3a5ec48f22 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -398,17 +398,7 @@ linux32)\n \t;;\n linux-feature-testbed)\n \texport OPENSSL_SHA1_UNSAFE=YesPlease\n-\texport GIT_TEST_SPLIT_INDEX=yes\n-\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n-\texport GIT_TEST_OE_SIZE=10\n-\texport GIT_TEST_OE_DELTA_SIZE=5\n-\texport GIT_TEST_COMMIT_GRAPH=1\n-\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n-\texport GIT_TEST_MULTI_PACK_INDEX=1\n-\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n-\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n-\texport GIT_TEST_CHECKOUT_WORKERS=2\n-\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n+\tGIT_TEST_OPTS=\"$GIT_TEST_OPTS --feature-testbed\"\n \t;;\n linux-meson)\n \tMESONFLAGS=\"$MESONFLAGS -Dcredential_helpers=libsecret,netrc\"\ndiff --git a/t/README b/t/README\nindex fd7e8504b51..211bf78aed9 100644\n--- a/t/README\n+++ b/t/README\n@@ -119,6 +119,11 @@ appropriately before running \"make\". Short options can be bundled, i.e.\n \tThis causes additional long-running tests to be run (where\n \tavailable), for more exhaustive testing.\n \n+--feature-testbed::\n+\tThis causes tests to run with several `GIT_TEST` environment\n+\tvariables set. The intent is to test Git with optional features\n+\tand non-default configuration.\n+\n -r::\n --run=<test-selector>::\n \tRun only the subset of tests indicated by\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex de566309861..8863bcac930 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -202,6 +202,14 @@ finalize_test_case_output () { :; }\n finalize_test_leak_output () { :; }\n finalize_test_output () { :; }\n \n+set_default_env () {\n+\tif eval \"test -z \\\"\\${$1+set}\\\"\"\n+\tthen\n+\t\teval \"$1=\\$2\"\n+\tfi\n+\texport \"$1\"\n+}\n+\n parse_option () {\n \tlocal opt=\"$1\"\n \n@@ -212,6 +220,19 @@ parse_option () {\n \t\timmediate=t ;;\n \t-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)\n \t\tGIT_TEST_LONG=true; export GIT_TEST_LONG ;;\n+\t--feature-testbed)\n+\t\tset_default_env GIT_TEST_SPLIT_INDEX yes\n+\t\tset_default_env GIT_TEST_FULL_IN_PACK_ARRAY true\n+\t\tset_default_env GIT_TEST_OE_SIZE 10\n+\t\tset_default_env GIT_TEST_OE_DELTA_SIZE 5\n+\t\tset_default_env GIT_TEST_COMMIT_GRAPH 1\n+\t\tset_default_env GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS 1\n+\t\tset_default_env GIT_TEST_MULTI_PACK_INDEX 1\n+\t\tset_default_env GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL 1\n+\t\tset_default_env GIT_TEST_NO_WRITE_REV_INDEX 1\n+\t\tset_default_env GIT_TEST_CHECKOUT_WORKERS 2\n+\t\tset_default_env GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL 1\n+\t\t;;\n \t-r)\n \t\tmark_option_requires_arg \"$opt\" run_list\n \t\t;;\ndiff --git a/t/unit-tests/unit-test.c b/t/unit-tests/unit-test.c\nindex 752fb38fb32..f4898353045 100644\n--- a/t/unit-tests/unit-test.c\n+++ b/t/unit-tests/unit-test.c\n@@ -27,6 +27,7 @@ int cmd_main(int argc, const char **argv)\n \t\t * options understood by integration tests.\n \t\t */\n \t\tOPT_NOOP_NOARG('d', \"debug\"),\n+\t\tOPT_NOOP_NOARG(0, \"feature-testbed\"),\n \t\tOPT_NOOP_NOARG(0, \"github-workflow-markup\"),\n \t\tOPT_NOOP_NOARG(0, \"no-bin-wrappers\"),\n \t\tOPT_NOOP_ARG(0, \"no-chain-lint\"),\n\n-- \n2.56.0.341.g393f52fd96.dirty\n\n\n"},{"id":"556514","messageId":"1da30fde-75bf-469f-80e1-ce90cd29c84d@gmail.com","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-8-f28edf79bd6c@pks.im","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-10-27T14:53:07Z","receivedAt":"2026-10-27T14:53:07Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Patrick\n\nOn 27/10/2026 08:18, Patrick Steinhardt wrote:\n> Our \"feature-testbed\" job sets up a bunch of GIT_TEST environment\n> variables and then executes our tests. This is mostly intended as a\n> testbed for features that aren't default-enabled, but that may\n> eventually become so.\n> > Due to the job being special it has a higher potential of failing even\n> though a local test run succeeds. But running these tests locally with\n> the same environment is somewhat painful, as the developer has to\n> manually set all of these environment variables.\n> > Introduce a new \"--feature-testbed\" toggle for our test suite that, when\n> set, sets up exactly these environment variables. Migrate our CI to use\n> this toggle so that we have a single source of truth, only.\n> > Note that we only set these GIT_TEST variables in the case where they\n> haven't already been configured. This serves two purposes:\n> >    - The user can continue to manually override a subset of those\n>      variables, if they desire.\n> >    - Test scripts typically source \"t/test-lib.sh\" after they already\n>      overrode GIT_TEST variables, and we don't want to discard that.\n\nThat all sounds sensible, the commit message could maybe flag that the \"feature-testbed\" also sets OPENSSL_SHA1_UNSAFE which \"--feature-testbed\" does not because it is only concerned with GIT_TEST_*.\n\n> diff --git a/t/test-lib.sh b/t/test-lib.sh\n> index de566309861..8863bcac930 100644\n> --- a/t/test-lib.sh\n> +++ b/t/test-lib.sh\n> @@ -202,6 +202,14 @@ finalize_test_case_output () { :; }\n>   finalize_test_leak_output () { :; }\n>   finalize_test_output () { :; }\n>   > +set_default_env () {\n> +\tif eval \"test -z \\\"\\${$1+set}\\\"\"\n\nThis made me scratch my head for a couple of minutes, but I think it is correct\n\n\tset_default_env ABC 1\n\nevaluates\n\n\ttest -z \"${ABC+set}\"\n\nto see if $ABC is unset.\n\nThanks\n\nPhillip\n> +\tthen\n> +\t\teval \"$1=\\$2\"\n> +\tfi\n> +\texport \"$1\"\n> +}\n> +\n>   parse_option () {\n>   \tlocal opt=\"$1\"\n>   > @@ -212,6 +220,19 @@ parse_option () {\n>   \t\timmediate=t ;;\n>   \t-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)\n>   \t\tGIT_TEST_LONG=true; export GIT_TEST_LONG ;;\n> +\t--feature-testbed)\n> +\t\tset_default_env GIT_TEST_SPLIT_INDEX yes\n> +\t\tset_default_env GIT_TEST_FULL_IN_PACK_ARRAY true\n> +\t\tset_default_env GIT_TEST_OE_SIZE 10\n> +\t\tset_default_env GIT_TEST_OE_DELTA_SIZE 5\n> +\t\tset_default_env GIT_TEST_COMMIT_GRAPH 1\n> +\t\tset_default_env GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS 1\n> +\t\tset_default_env GIT_TEST_MULTI_PACK_INDEX 1\n> +\t\tset_default_env GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL 1\n> +\t\tset_default_env GIT_TEST_NO_WRITE_REV_INDEX 1\n> +\t\tset_default_env GIT_TEST_CHECKOUT_WORKERS 2\n> +\t\tset_default_env GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL 1\n> +\t\t;;\n>   \t-r)\n>   \t\tmark_option_requires_arg \"$opt\" run_list\n>   \t\t;;\n> diff --git a/t/unit-tests/unit-test.c b/t/unit-tests/unit-test.c\n> index 752fb38fb32..f4898353045 100644\n> --- a/t/unit-tests/unit-test.c\n> +++ b/t/unit-tests/unit-test.c\n> @@ -27,6 +27,7 @@ int cmd_main(int argc, const char **argv)\n>   \t\t * options understood by integration tests.\n>   \t\t */\n>   \t\tOPT_NOOP_NOARG('d', \"debug\"),\n> +\t\tOPT_NOOP_NOARG(0, \"feature-testbed\"),\n>   \t\tOPT_NOOP_NOARG(0, \"github-workflow-markup\"),\n>   \t\tOPT_NOOP_NOARG(0, \"no-bin-wrappers\"),\n>   \t\tOPT_NOOP_ARG(0, \"no-chain-lint\"),\n> "},{"id":"556519","messageId":"e1d49985-0ce5-4411-aab7-11d90969363f@gmail.com","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"Re: [PATCH 0/8] ci: consolidate test variables","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-10-27T15:00:48Z","receivedAt":"2026-10-27T15:00:48Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Patrick\n\nOn 27/10/2026 08:18, Patrick Steinhardt wrote:\n> Hi,\n> > this patch series consolidates our test variables as a follow up on the\n> discussions in [1].\n> > The series is built on top of 37b3475fb53 (The 9th batch, 2026-10-25).\n\nI looked at the diff for the whole series rather than the individual patches and it looks nice. The changes to move all the job dependent variable assignments into ci/lib.sh and the removal of the linux-reftable-sha256 job while maintaining our coverage are very welcome. It probably makes sense to disable rust for the sanitizer job which is aimed at checking our C code, though if we end up with more unsafe rust in the future maybe the balance will shift?\n\nThanks\n\nPhillip\n\n> > Thanks!\n> > Patrick\n> > [1]: <20261008-pks-ci-housekeeping-v1-0-baf015c589c0@pks.im>\n> > ---\n> Patrick Steinhardt (8):\n>        ci: consolidate setup of test environment\n>        ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs\n>        ci/lib: deduplicate test variables by pattern matching\n>        ci/lib: merge switches for specific job names\n>        t: honor default ref storage format\n>        ci/lib: add another NO_RUST build using glibc\n>        ci: don't override initial branch name in testbed job\n>        t/test-lib: make feature-testbed job more accessible\n> >   .github/workflows/main.yml |  3 ---\n>   .gitlab-ci.yml             |  3 ---\n>   ci/lib.sh                  | 34 ++++++++++++++++++++++++++++++++--\n>   ci/run-build-and-tests.sh  | 44 --------------------------------------------\n>   t/README                   |  5 +++++\n>   t/test-lib-functions.sh    |  2 +-\n>   t/test-lib.sh              | 25 ++++++++++++++++++++++++-\n>   t/unit-tests/unit-test.c   |  1 +\n>   8 files changed, 63 insertions(+), 54 deletions(-)\n> > > ---\n> base-commit: 37b3475fb530c14109211faca33716a173db61ed\n> change-id: 20261016-b4-pks-ci-test-vars-consolidation-8d0c6a53ca28\n\n\n"},{"id":"556579","messageId":"xmqq4ie6j1vw.fsf@gitster.g","threadId":"66676","inReplyTo":"1da30fde-75bf-469f-80e1-ce90cd29c84d@gmail.com","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-10-27T20:59:31Z","receivedAt":"2026-10-27T20:59:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood <phillip.wood123@gmail.com> writes:\n\n> That all sounds sensible, the commit message could maybe flag that the \n> \"feature-testbed\" also sets OPENSSL_SHA1_UNSAFE which \n> \"--feature-testbed\" does not because it is only concerned with GIT_TEST_*.\n>\n>> diff --git a/t/test-lib.sh b/t/test-lib.sh\n>> index de566309861..8863bcac930 100644\n>> --- a/t/test-lib.sh\n>> +++ b/t/test-lib.sh\n>> @@ -202,6 +202,14 @@ finalize_test_case_output () { :; }\n>>   finalize_test_leak_output () { :; }\n>>   finalize_test_output () { :; }\n>>   \n>> +set_default_env () {\n>> +\tif eval \"test -z \\\"\\${$1+set}\\\"\"\n>\n> This made me scratch my head for a couple of minutes, but I think it is \n> correct\n>\n> \tset_default_env ABC 1\n>\n> evaluates\n>\n> \ttest -z \"${ABC+set}\"\n>\n> to see if $ABC is unset.\n>\n> Thanks\n>\n> Phillip\n>> +\tthen\n>> +\t\teval \"$1=\\$2\"\n\nThis one may want to quote the right hand side to be more widely\nportable, i.e., eval \"$1=\\\"\\$2\\\"\" or something along that line.\nPOSIX Bourne shell does not require the right hand side \n\n    VARIABLE=$VAR\n\nto be quoted, but CodingGuidelines has observed some buggy shells.\nIt may be better to be extra clear than sorry.\n\n\n"},{"id":"556580","messageId":"xmqqzevyhnaq.fsf@gitster.g","threadId":"66676","inReplyTo":"e1d49985-0ce5-4411-aab7-11d90969363f@gmail.com","subject":"Re: [PATCH 0/8] ci: consolidate test variables","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-10-27T20:59:57Z","receivedAt":"2026-10-27T20:59:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood <phillip.wood123@gmail.com> writes:\n\n> Hi Patrick\n>\n> On 27/10/2026 08:18, Patrick Steinhardt wrote:\n>> Hi,\n>> \n>> this patch series consolidates our test variables as a follow up on the\n>> discussions in [1].\n>> \n>> The series is built on top of 37b3475fb53 (The 9th batch, 2026-10-25).\n>\n> I looked at the diff for the whole series rather than the individual \n> patches and it looks nice. The changes to move all the job dependent \n> variable assignments into ci/lib.sh and the removal of the \n> linux-reftable-sha256 job while maintaining our coverage are very \n> welcome. It probably makes sense to disable rust for the sanitizer job \n> which is aimed at checking our C code, though if we end up with more \n> unsafe rust in the future maybe the balance will shift?\n>\n> Thanks\n>\n> Phillip\n\nThanks for writing and reviewing.\n\n\n"},{"id":"556582","messageId":"20261027212349.GA774120@coredump.intra.peff.net","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-8-f28edf79bd6c@pks.im","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2026-10-27T21:23:49Z","receivedAt":"2026-10-27T21:23:49Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Oct 27, 2026 at 09:18:28AM +0100, Patrick Steinhardt wrote:\n\n> Due to the job being special it has a higher potential of failing even\n> though a local test run succeeds. But running these tests locally with\n> the same environment is somewhat painful, as the developer has to\n> manually set all of these environment variables.\n\nOK. I've usually just cut-and-paste them, as my first step is figuring\nout which is the culprit anyway. My biggest question was: what if the\nculprit is a build flag, and indeed, we leave the one build flag here:\n\n>  linux-feature-testbed)\n>  \texport OPENSSL_SHA1_UNSAFE=YesPlease\n> -\texport GIT_TEST_SPLIT_INDEX=yes\n> -\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n> -\texport GIT_TEST_OE_SIZE=10\n> -\texport GIT_TEST_OE_DELTA_SIZE=5\n> -\texport GIT_TEST_COMMIT_GRAPH=1\n> -\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n> -\texport GIT_TEST_MULTI_PACK_INDEX=1\n> -\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n> -\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n> -\texport GIT_TEST_CHECKOUT_WORKERS=2\n> -\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n> +\tGIT_TEST_OPTS=\"$GIT_TEST_OPTS --feature-testbed\"\n\nwhich makes this feature only half-work (well, 11/12 if we want to be\npedantic).\n\nIMHO this whole thing isn't really worth the complexity, but if we are\ngoing to do it, should it be \"make FEATURE_TESTBED=1\", and then that\nenables the right build knobs, and test-lib.sh respects that variable\ncoming from BUILD-OPTIONS rather than the command line?\n\n-Peff\n\n"},{"id":"556583","messageId":"20261027212431.GB774120@coredump.intra.peff.net","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"Re: [PATCH 0/8] ci: consolidate test variables","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2026-10-27T21:24:31Z","receivedAt":"2026-10-27T21:24:31Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Oct 27, 2026 at 09:18:20AM +0100, Patrick Steinhardt wrote:\n\n> this patch series consolidates our test variables as a follow up on the\n> discussions in [1].\n\nThanks for following up. 1-7 seem obviously good to me. I'm lukewarm on\nthe final patch (and left a comment there), but if you really love it, I\ncan live with it. :)\n\n-Peff\n\n"},{"id":"556584","messageId":"xmqqpkwuhl3p.fsf@gitster.g","threadId":"66676","inReplyTo":"20261027212349.GA774120@coredump.intra.peff.net","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-10-27T21:47:22Z","receivedAt":"2026-10-27T21:47:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Tue, Oct 27, 2026 at 09:18:28AM +0100, Patrick Steinhardt wrote:\n>\n>> Due to the job being special it has a higher potential of failing even\n>> though a local test run succeeds. But running these tests locally with\n>> the same environment is somewhat painful, as the developer has to\n>> manually set all of these environment variables.\n>\n> OK. I've usually just cut-and-paste them, as my first step is figuring\n> out which is the culprit anyway. My biggest question was: what if the\n> culprit is a build flag, and indeed, we leave the one build flag here:\n>\n>>  linux-feature-testbed)\n>>  \texport OPENSSL_SHA1_UNSAFE=YesPlease\n>> -\texport GIT_TEST_SPLIT_INDEX=yes\n>> -\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n>> -\texport GIT_TEST_OE_SIZE=10\n>> -\texport GIT_TEST_OE_DELTA_SIZE=5\n>> -\texport GIT_TEST_COMMIT_GRAPH=1\n>> -\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n>> -\texport GIT_TEST_MULTI_PACK_INDEX=1\n>> -\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n>> -\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n>> -\texport GIT_TEST_CHECKOUT_WORKERS=2\n>> -\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n>> +\tGIT_TEST_OPTS=\"$GIT_TEST_OPTS --feature-testbed\"\n>\n> which makes this feature only half-work (well, 11/12 if we want to be\n> pedantic).\n>\n> IMHO this whole thing isn't really worth the complexity, but if we are\n> going to do it, should it be \"make FEATURE_TESTBED=1\", and then that\n> enables the right build knobs, and test-lib.sh respects that variable\n> coming from BUILD-OPTIONS rather than the command line?\n\nYes, I love the simplicity of that approach.\n\n"},{"id":"556616","messageId":"auGmvTuD1NcFIw37@pks.im","threadId":"66676","inReplyTo":"20261027212349.GA774120@coredump.intra.peff.net","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-28T07:39:41Z","receivedAt":"2026-10-28T07:39:41Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Tue, Oct 27, 2026 at 05:23:49PM -0400, Jeff King wrote:\n> On Tue, Oct 27, 2026 at 09:18:28AM +0100, Patrick Steinhardt wrote:\n> \n> > Due to the job being special it has a higher potential of failing even\n> > though a local test run succeeds. But running these tests locally with\n> > the same environment is somewhat painful, as the developer has to\n> > manually set all of these environment variables.\n> \n> OK. I've usually just cut-and-paste them, as my first step is figuring\n> out which is the culprit anyway. My biggest question was: what if the\n> culprit is a build flag, and indeed, we leave the one build flag here:\n> \n> >  linux-feature-testbed)\n> >  \texport OPENSSL_SHA1_UNSAFE=YesPlease\n> > -\texport GIT_TEST_SPLIT_INDEX=yes\n> > -\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n> > -\texport GIT_TEST_OE_SIZE=10\n> > -\texport GIT_TEST_OE_DELTA_SIZE=5\n> > -\texport GIT_TEST_COMMIT_GRAPH=1\n> > -\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n> > -\texport GIT_TEST_MULTI_PACK_INDEX=1\n> > -\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n> > -\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n> > -\texport GIT_TEST_CHECKOUT_WORKERS=2\n> > -\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n> > +\tGIT_TEST_OPTS=\"$GIT_TEST_OPTS --feature-testbed\"\n> \n> which makes this feature only half-work (well, 11/12 if we want to be\n> pedantic).\n> \n> IMHO this whole thing isn't really worth the complexity, but if we are\n> going to do it, should it be \"make FEATURE_TESTBED=1\", and then that\n> enables the right build knobs, and test-lib.sh respects that variable\n> coming from BUILD-OPTIONS rather than the command line?\n\nI dunno. Until now I've never had the case myself where the issue is\nbecause of the above build flag, test errors were only ever caused by\none of the GIT_TEST variables. So what I typically want is to toggle\nbetween GIT_TEST- and non-GIT_TEST test runs, and ideally without having\nto recompile everything. And more often than not I want to only do this\nfor a single test file, only.\n\nSo I'm not much of a fan of moving this into our BUILD-OPTIONS, as it\nwould kind of defeat my own use case for it. I'm thus inclined to either\nleave this as-is, or drop the patch altogether. I don't terribly mind\neither of those outcomes.\n\nPatrick\n\n"},{"id":"556617","messageId":"auGnJ_cb5vQgo0We@pks.im","threadId":"66676","inReplyTo":"xmqq4ie6j1vw.fsf@gitster.g","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-10-28T07:41:27Z","receivedAt":"2026-10-28T07:41:27Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Tue, Oct 27, 2026 at 01:59:31PM -0700, Junio C Hamano wrote:\n> Phillip Wood <phillip.wood123@gmail.com> writes:\n> \n> > That all sounds sensible, the commit message could maybe flag that the \n> > \"feature-testbed\" also sets OPENSSL_SHA1_UNSAFE which \n> > \"--feature-testbed\" does not because it is only concerned with GIT_TEST_*.\n> >\n> >> diff --git a/t/test-lib.sh b/t/test-lib.sh\n> >> index de566309861..8863bcac930 100644\n> >> --- a/t/test-lib.sh\n> >> +++ b/t/test-lib.sh\n> >> @@ -202,6 +202,14 @@ finalize_test_case_output () { :; }\n> >>   finalize_test_leak_output () { :; }\n> >>   finalize_test_output () { :; }\n> >>   \n> >> +set_default_env () {\n> >> +\tif eval \"test -z \\\"\\${$1+set}\\\"\"\n> >\n> > This made me scratch my head for a couple of minutes, but I think it is \n> > correct\n> >\n> > \tset_default_env ABC 1\n> >\n> > evaluates\n> >\n> > \ttest -z \"${ABC+set}\"\n> >\n> > to see if $ABC is unset.\n> >\n> > Thanks\n> >\n> > Phillip\n> >> +\tthen\n> >> +\t\teval \"$1=\\$2\"\n> \n> This one may want to quote the right hand side to be more widely\n> portable, i.e., eval \"$1=\\\"\\$2\\\"\" or something along that line.\n> POSIX Bourne shell does not require the right hand side \n> \n>     VARIABLE=$VAR\n> \n> to be quoted, but CodingGuidelines has observed some buggy shells.\n> It may be better to be extra clear than sorry.\n\nFair. I've queued this change locally for now, but will wait for the\ndiscussion to figure out whether I'll keep this change in the first\nplace.\n\nThanks!\n\nPatrick\n\n"},{"id":"556668","messageId":"617fa828-387a-4f4a-bc85-099ca691bca4@gmail.com","threadId":"66676","inReplyTo":"20261027212349.GA774120@coredump.intra.peff.net","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-10-28T14:33:15Z","receivedAt":"2026-10-28T14:33:15Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 27/10/2026 21:23, Jeff King wrote:\n> > IMHO this whole thing isn't really worth the complexity, but if we are\n> going to do it, should it be \"make FEATURE_TESTBED=1\", and then that\n> enables the right build knobs, and test-lib.sh respects that variable\n> coming from BUILD-OPTIONS rather than the command line?\n\nIf we want to be able to recreate the CI job locally then I agree a Makefile flag is a better solution. I seem to remember Ævar trying to add Makefile targets for some of the CI jobs so they could be run locally.\n\nThanks\n\nPhillip\n\n\n"},{"id":"556669","messageId":"87mrrxzy4p.fsf@dev.null.iotcl.com.invalid","threadId":"66676","inReplyTo":"20261027212431.GB774120@coredump.intra.peff.net","subject":"Re: [PATCH 0/8] ci: consolidate test variables","fromName":"Toon Claes","fromEmail":"toon@iotcl.com","sentAt":"2026-10-28T14:40:54Z","receivedAt":"2026-10-28T14:40:54Z","isPatch":true,"sender":{"key":"toon@iotcl.com","avatar":"https://avatars.githubusercontent.com/u/121621?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Tue, Oct 27, 2026 at 09:18:20AM +0100, Patrick Steinhardt wrote:\n>\n>> this patch series consolidates our test variables as a follow up on the\n>> discussions in [1].\n>\n> Thanks for following up. 1-7 seem obviously good to me.\n\nYes, 1-7 look good and are pretty much noncontroversial.\n\n> I'm lukewarm on the final patch (and left a comment there), but if you\n> really love it, I can live with it. :)\n\nI understand the stance of both of you. To be honest, I don't really\nhave an opinion. The cleanest fix probably would be to split the build\nflags from test flags, because it's a mix now and Peff prefers to have\nthem all fixed, while Patrick likes to change them run-by-run. Although,\nthat would probably lead this patch series beyond their intentions.\n\n-- \nLaters,\nToon\n\n"},{"id":"557149","messageId":"auhw9ft8vVGAHP00@pks.im","threadId":"66676","inReplyTo":"617fa828-387a-4f4a-bc85-099ca691bca4@gmail.com","subject":"Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:16:05Z","receivedAt":"2026-11-02T11:16:05Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Wed, Oct 28, 2026 at 02:33:15PM +0000, Phillip Wood wrote:\n> On 27/10/2026 21:23, Jeff King wrote:\n> > \n> > IMHO this whole thing isn't really worth the complexity, but if we are\n> > going to do it, should it be \"make FEATURE_TESTBED=1\", and then that\n> > enables the right build knobs, and test-lib.sh respects that variable\n> > coming from BUILD-OPTIONS rather than the command line?\n> \n> If we want to be able to recreate the CI job locally then I agree a Makefile\n> flag is a better solution. I seem to remember Ævar trying to add Makefile\n> targets for some of the CI jobs so they could be run locally.\n\nAs said elsewhere though this doesn't fit my own use case, which is to\nquickly re-run a patch series with these features enabled and disabled.\nSo I'll just drop this patch altogether.\n\nThanks!\n\nPatrick\n\n"},{"id":"557150","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im","subject":"[PATCH v2 0/7] ci: consolidate test variables","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:48Z","receivedAt":"2026-11-02T11:17:48Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"Hi,\n\nthis patch series consolidates our test variables as a follow up on the\ndiscussions in [1].\n\nThe series is built on top of 37b3475fb53 (The 9th batch, 2026-10-25).\n\nChanges in v2:\n  - Drop the last patch, as the reviewers seemed to favor an approach\n    that's not compatible with my own use case for this change. We can\n    still discuss this separately.\n  - Link to v1: https://patch.msgid.link/20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im\n\nThanks!\n\nPatrick\n\n[1]: <20261008-pks-ci-housekeeping-v1-0-baf015c589c0@pks.im>\n\n---\nPatrick Steinhardt (7):\n      ci: consolidate setup of test environment\n      ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs\n      ci/lib: deduplicate test variables by pattern matching\n      ci/lib: merge switches for specific job names\n      t: honor default ref storage format\n      ci/lib: add another NO_RUST build using glibc\n      ci: don't override initial branch name in testbed job\n\n .github/workflows/main.yml |  3 ---\n .gitlab-ci.yml             |  3 ---\n ci/lib.sh                  | 44 ++++++++++++++++++++++++++++++++++++++++++--\n ci/run-build-and-tests.sh  | 44 --------------------------------------------\n t/test-lib-functions.sh    |  2 +-\n t/test-lib.sh              |  4 +++-\n 6 files changed, 46 insertions(+), 54 deletions(-)\n\nRange-diff versus v1:\n\n1:  a8727388da8 = 1:  3ba3d58ea4d ci: consolidate setup of test environment\n2:  ea243343552 = 2:  52c9d8d575b ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs\n3:  1751b336cbd = 3:  139a855e36b ci/lib: deduplicate test variables by pattern matching\n4:  b3ffcf0d81f = 4:  5c82ad5c76f ci/lib: merge switches for specific job names\n5:  db5d05f0743 = 5:  8329586dbb6 t: honor default ref storage format\n6:  0683eba847c = 6:  1f62c2fa8a4 ci/lib: add another NO_RUST build using glibc\n7:  8c2e6754773 = 7:  2f656a16971 ci: don't override initial branch name in testbed job\n8:  ea39ba888b8 < -:  ----------- t/test-lib: make feature-testbed job more accessible\n\n---\nbase-commit: 37b3475fb530c14109211faca33716a173db61ed\nchange-id: 20261016-b4-pks-ci-test-vars-consolidation-8d0c6a53ca28\n\n\n"},{"id":"557151","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-1-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"[PATCH v2 1/7] ci: consolidate setup of test environment","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:49Z","receivedAt":"2026-11-02T11:17:49Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"The setup of our test environment is split up across \"ci/lib.sh\" and\n\"ci/run-build-and-tests.sh\". It is not exactly obvious why that split\neven exists, and because of the split you have to know about both of the\nlocations to be able to figure out the specific environment that applies\nto a specific job.\n\nConsolidate the setup into \"ci/lib.sh\". Note that this is a pure move\nfor now that results in some awkward duplication. This duplication will\nbe cleaned up in subsequent commits.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh                 | 43 +++++++++++++++++++++++++++++++++++++++++++\n ci/run-build-and-tests.sh | 44 --------------------------------------------\n 2 files changed, 43 insertions(+), 44 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 2e63d652543..d0bd8113d35 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -394,7 +394,50 @@ osx-meson)\n \t;;\n esac\n \n+case \"$jobname\" in\n+linux-musl-meson)\n+\tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n+\texport GIT_TEST_USE_SET_E=yes\n+\t;;\n+almalinux-*|debian-*|fedora-*|linux-*)\n+\texport GIT_TEST_USE_SET_E=yes\n+\t;;\n+esac\n+\n+case \"$jobname\" in\n+fedora-breaking-changes-meson|linux-breaking-changes)\n+\texport WITH_BREAKING_CHANGES=YesPlease\n+\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n+\t;;\n+linux-feature-testbed)\n+\texport OPENSSL_SHA1_UNSAFE=YesPlease\n+\texport GIT_TEST_SPLIT_INDEX=yes\n+\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n+\texport GIT_TEST_OE_SIZE=10\n+\texport GIT_TEST_OE_DELTA_SIZE=5\n+\texport GIT_TEST_COMMIT_GRAPH=1\n+\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n+\texport GIT_TEST_MULTI_PACK_INDEX=1\n+\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n+\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n+\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n+\texport GIT_TEST_CHECKOUT_WORKERS=2\n+\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n+\t;;\n+linux-sha256)\n+\texport GIT_TEST_DEFAULT_HASH=sha256\n+\t;;\n+linux-reftable-sha256)\n+\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n+\texport GIT_TEST_DEFAULT_HASH=sha256\n+\t;;\n+linux-reftable-leaks|osx-reftable)\n+\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n+\t;;\n+esac\n+\n MAKEFLAGS=\"$MAKEFLAGS CC=${CC:-cc}\"\n+export TEST_CONTRIB_TOO=yes\n \n end_group \"CI setup via $(basename $0)\"\n set -x\ndiff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh\nindex 68b91e31439..b81d654b561 100755\n--- a/ci/run-build-and-tests.sh\n+++ b/ci/run-build-and-tests.sh\n@@ -5,50 +5,6 @@\n \n . ${0%/*}/lib.sh\n \n-export TEST_CONTRIB_TOO=yes\n-\n-case \"$jobname\" in\n-linux-musl-meson)\n-\tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n-\texport GIT_TEST_USE_SET_E=yes\n-\t;;\n-almalinux-*|debian-*|fedora-*|linux-*)\n-\texport GIT_TEST_USE_SET_E=yes\n-\t;;\n-esac\n-\n-case \"$jobname\" in\n-fedora-breaking-changes-meson|linux-breaking-changes)\n-\texport WITH_BREAKING_CHANGES=YesPlease\n-\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n-\t;;\n-linux-feature-testbed)\n-\texport OPENSSL_SHA1_UNSAFE=YesPlease\n-\texport GIT_TEST_SPLIT_INDEX=yes\n-\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n-\texport GIT_TEST_OE_SIZE=10\n-\texport GIT_TEST_OE_DELTA_SIZE=5\n-\texport GIT_TEST_COMMIT_GRAPH=1\n-\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n-\texport GIT_TEST_MULTI_PACK_INDEX=1\n-\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n-\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n-\texport GIT_TEST_CHECKOUT_WORKERS=2\n-\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n-\t;;\n-linux-sha256)\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-sha256)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-leaks|osx-reftable)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\t;;\n-esac\n-\n case \"$jobname\" in\n *-meson)\n \tgroup \"Configure\" meson setup build . \\\n\n-- \n2.56.0.500.g5d06dc02cd.dirty\n\n\n"},{"id":"557152","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-2-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"[PATCH v2 2/7] ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:50Z","receivedAt":"2026-11-02T11:17:50Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"The GIT_TEST_USE_SET_E test variable determines whether we run our test\nsuite with `set -e` enabled or not. This works on all of our supported\nLinux distributions, but it doesn't work on macOS because the version of\nBash used there is rather old and thus has some differences in\nbehaviour.\n\nWe currently set that variable for a bunch of distros explicitly, which\nis tedious to keep up-to-date. For example, our \"linux32\" job does not\nenable the test variable even though it could. Adapt the script to\ninstead set it on any Linux distribution.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 10 ++++++----\n 1 file changed, 6 insertions(+), 4 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex d0bd8113d35..560d785f67c 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -367,6 +367,12 @@ esac\n CUSTOM_PATH=\"${CUSTOM_PATH:-$HOME/path}\"\n export PATH=\"$CUSTOM_PATH:$PATH\"\n \n+case \"$CI_OS_NAME\" in\n+linux)\n+\texport GIT_TEST_USE_SET_E=yes\n+\t;;\n+esac\n+\n case \"$jobname\" in\n linux32)\n \tCC=gcc\n@@ -397,10 +403,6 @@ esac\n case \"$jobname\" in\n linux-musl-meson)\n \tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n-\texport GIT_TEST_USE_SET_E=yes\n-\t;;\n-almalinux-*|debian-*|fedora-*|linux-*)\n-\texport GIT_TEST_USE_SET_E=yes\n \t;;\n esac\n \n\n-- \n2.56.0.500.g5d06dc02cd.dirty\n\n\n"},{"id":"557153","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-3-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"[PATCH v2 3/7] ci/lib: deduplicate test variables by pattern matching","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:51Z","receivedAt":"2026-11-02T11:17:51Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"We have a couple of test variables that we set in multiple different\njobs. These jobs always have specific identifiers in their names and can\nthus easily be told apart from the other jobs.\n\nUse this fact to deduplicate the setup of those test variables by\npattern matching for those identifiers.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 33 +++++++++++++++++++--------------\n 1 file changed, 19 insertions(+), 14 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 560d785f67c..de4b94d4d33 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -373,6 +373,25 @@ linux)\n \t;;\n esac\n \n+case \"$jobname\" in\n+*breaking-changes*)\n+\texport WITH_BREAKING_CHANGES=YesPlease\n+\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n+\t;;\n+esac\n+\n+case \"$jobname\" in\n+*reftable*)\n+\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n+\t;;\n+esac\n+\n+case \"$jobname\" in\n+*sha256*)\n+\texport GIT_TEST_DEFAULT_HASH=sha256\n+\t;;\n+esac\n+\n case \"$jobname\" in\n linux32)\n \tCC=gcc\n@@ -407,10 +426,6 @@ linux-musl-meson)\n esac\n \n case \"$jobname\" in\n-fedora-breaking-changes-meson|linux-breaking-changes)\n-\texport WITH_BREAKING_CHANGES=YesPlease\n-\tMESONFLAGS=\"$MESONFLAGS -Dbreaking_changes=true\"\n-\t;;\n linux-feature-testbed)\n \texport OPENSSL_SHA1_UNSAFE=YesPlease\n \texport GIT_TEST_SPLIT_INDEX=yes\n@@ -426,16 +441,6 @@ linux-feature-testbed)\n \texport GIT_TEST_CHECKOUT_WORKERS=2\n \texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n \t;;\n-linux-sha256)\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-sha256)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\texport GIT_TEST_DEFAULT_HASH=sha256\n-\t;;\n-linux-reftable-leaks|osx-reftable)\n-\texport GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable\n-\t;;\n esac\n \n MAKEFLAGS=\"$MAKEFLAGS CC=${CC:-cc}\"\n\n-- \n2.56.0.500.g5d06dc02cd.dirty\n\n\n"},{"id":"557154","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-4-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"[PATCH v2 4/7] ci/lib: merge switches for specific job names","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:52Z","receivedAt":"2026-11-02T11:17:52Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"With the preceding consolidations of test variables we now pointlessly\nhave three switches over \"$jobname\". Merge them into a single switch.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 41 ++++++++++++++++-------------------------\n 1 file changed, 16 insertions(+), 25 deletions(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex de4b94d4d33..7f67a95cdcc 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -396,11 +396,26 @@ case \"$jobname\" in\n linux32)\n \tCC=gcc\n \t;;\n+linux-feature-testbed)\n+\texport OPENSSL_SHA1_UNSAFE=YesPlease\n+\texport GIT_TEST_SPLIT_INDEX=yes\n+\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n+\texport GIT_TEST_OE_SIZE=10\n+\texport GIT_TEST_OE_DELTA_SIZE=5\n+\texport GIT_TEST_COMMIT_GRAPH=1\n+\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n+\texport GIT_TEST_MULTI_PACK_INDEX=1\n+\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n+\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n+\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n+\texport GIT_TEST_CHECKOUT_WORKERS=2\n+\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n+\t;;\n linux-meson)\n \tMESONFLAGS=\"$MESONFLAGS -Dcredential_helpers=libsecret,netrc\"\n \t;;\n linux-musl-meson)\n-\tMESONFLAGS=\"$MESONFLAGS -Dtest_utf8_locale=C.UTF-8\"\n+\tMESONFLAGS=\"$MESONFLAGS -Dtest_utf8_locale=C.UTF-8 -Drust=disabled\"\n \t;;\n linux-leaks|linux-reftable-leaks)\n \texport SANITIZE=leak\n@@ -419,30 +434,6 @@ osx-meson)\n \t;;\n esac\n \n-case \"$jobname\" in\n-linux-musl-meson)\n-\tMESONFLAGS=\"$MESONFLAGS -Drust=disabled\"\n-\t;;\n-esac\n-\n-case \"$jobname\" in\n-linux-feature-testbed)\n-\texport OPENSSL_SHA1_UNSAFE=YesPlease\n-\texport GIT_TEST_SPLIT_INDEX=yes\n-\texport GIT_TEST_FULL_IN_PACK_ARRAY=true\n-\texport GIT_TEST_OE_SIZE=10\n-\texport GIT_TEST_OE_DELTA_SIZE=5\n-\texport GIT_TEST_COMMIT_GRAPH=1\n-\texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n-\texport GIT_TEST_MULTI_PACK_INDEX=1\n-\texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n-\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n-\texport GIT_TEST_NO_WRITE_REV_INDEX=1\n-\texport GIT_TEST_CHECKOUT_WORKERS=2\n-\texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n-\t;;\n-esac\n-\n MAKEFLAGS=\"$MAKEFLAGS CC=${CC:-cc}\"\n export TEST_CONTRIB_TOO=yes\n \n\n-- \n2.56.0.500.g5d06dc02cd.dirty\n\n\n"},{"id":"557155","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-5-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"[PATCH v2 5/7] t: honor default ref storage format","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:53Z","receivedAt":"2026-11-02T11:17:53Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"When running with breaking changes enabled then we will also run tests\nwith the SHA256 object hash by default, unless explicitly overridden.\nBut we don't do the same for ref storage format and will continue to run\ntests with the \"files\" backend even though \"reftables\" are going to be\nthe default backend there.\n\nAdapt the logic to also use the compiled-in default ref storage backend\nfor running our tests. Like this we'll now exercise the \"reftable\"\nbackend when breaking changes are enabled.\n\nThis of course also applies to our CI jobs, where jobs exercising\nbreaking changes will run now with both SHA256 and reftables. This\nrenders the explicit \"linux-reftable-sha256\" job obsolete. Drop it.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n .github/workflows/main.yml | 3 ---\n .gitlab-ci.yml             | 3 ---\n t/test-lib-functions.sh    | 2 +-\n t/test-lib.sh              | 4 +++-\n 4 files changed, 4 insertions(+), 8 deletions(-)\n\ndiff --git a/.github/workflows/main.yml b/.github/workflows/main.yml\nindex fe8155772ab..4353af2354e 100644\n--- a/.github/workflows/main.yml\n+++ b/.github/workflows/main.yml\n@@ -405,9 +405,6 @@ jobs:\n         - jobname: linux-sha256\n           image: ubuntu:rolling\n           cc: clang\n-        - jobname: linux-reftable-sha256\n-          image: ubuntu:rolling\n-          cc: clang\n         - jobname: linux-feature-testbed\n           image: ubuntu:latest\n         - jobname: linux-breaking-changes\ndiff --git a/.gitlab-ci.yml b/.gitlab-ci.yml\nindex 9b7698a0037..52c26f72671 100644\n--- a/.gitlab-ci.yml\n+++ b/.gitlab-ci.yml\n@@ -39,9 +39,6 @@ test:linux:\n       - jobname: linux-sha256\n         image: ubuntu:rolling\n         CC: clang\n-      - jobname: linux-reftable-sha256\n-        image: ubuntu:rolling\n-        CC: clang\n       - jobname: linux-feature-testbed\n         image: ubuntu:latest\n       - jobname: linux-breaking-changes\ndiff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh\nindex 09a41d51adc..6f319cd54ba 100644\n--- a/t/test-lib-functions.sh\n+++ b/t/test-lib-functions.sh\n@@ -1737,7 +1737,7 @@ test_detect_hash () {\n \n # Detect the ref format in use.\n test_detect_ref_format () {\n-\techo \"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-files}\"\n+\techo \"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-$GIT_TEST_BUILTIN_REF_STORAGE_FORMAT}\"\n }\n \n # Load common hash metadata and common placeholder object IDs for use with\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex a893963f86c..de566309861 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -576,7 +576,9 @@ export EDITOR\n GIT_TEST_BUILTIN_HASH=$(\"$GIT_BINARY\" version --build-options | sed -ne 's/^default-hash: //p')\n GIT_DEFAULT_HASH=\"${GIT_TEST_DEFAULT_HASH:-$GIT_TEST_BUILTIN_HASH}\"\n export GIT_DEFAULT_HASH\n-GIT_DEFAULT_REF_STORAGE_FORMAT=\"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-files}\"\n+\n+GIT_TEST_BUILTIN_REF_STORAGE_FORMAT=$(\"$GIT_BINARY\" version --build-options | sed -ne 's/^default-ref-storage-format: //p')\n+GIT_DEFAULT_REF_STORAGE_FORMAT=\"${GIT_TEST_DEFAULT_REF_STORAGE_FORMAT:-$GIT_TEST_BUILTIN_REF_STORAGE_FORMAT}\"\n export GIT_DEFAULT_REF_STORAGE_FORMAT\n \n # Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output\n\n-- \n2.56.0.500.g5d06dc02cd.dirty\n\n\n"},{"id":"557156","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-6-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"[PATCH v2 6/7] ci/lib: add another NO_RUST build using glibc","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:54Z","receivedAt":"2026-11-02T11:17:54Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"With 32d5b90590 (Enable Rust by default, 2026-04-09) we have enabled\nRust by default. As part of that change we also lost test coverage of\nnon-Rust builds, as the only platform where we still exercise without\nRust is on Alpine Linux with musl libc.\n\nAdapt the \"linux-asan-ubsan\" job to disable Rust to restore some of that\ncoverage. This job was chosen because we also get more bang for the buck\nchecking for memory safety issues in a job where we use C instead of\nRust, as Rust is supposedly memory-safe by itself already.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 7f67a95cdcc..82bc169ed7a 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -427,7 +427,7 @@ linux-leaks|linux-reftable-leaks)\n linux-asan-ubsan)\n \texport SANITIZE=address,undefined\n \texport NO_SVN_TESTS=LetsSaveSomeTime\n-\tMAKEFLAGS=\"$MAKEFLAGS NO_PYTHON=YepBecauseP4FlakesTooOften\"\n+\tMAKEFLAGS=\"$MAKEFLAGS NO_PYTHON=YepBecauseP4FlakesTooOften NO_RUST=Yes\"\n \t;;\n osx-meson)\n \tMESONFLAGS=\"$MESONFLAGS -Dcredential_helpers=osxkeychain\"\n\n-- \n2.56.0.500.g5d06dc02cd.dirty\n\n\n"},{"id":"557157","messageId":"20261102-b4-pks-ci-test-vars-consolidation-v2-7-a5485c437c62@pks.im","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"[PATCH v2 7/7] ci: don't override initial branch name in testbed job","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-11-02T11:17:55Z","receivedAt":"2026-11-02T11:17:55Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"The testbed job overrides GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME to\n\"master\". This is rather pointless nowadays though, as we already\nconfigure the initial branch name to either \"main\" or \"master\" depending\non the \"WITH_BREAKING_CHANGES\" toggle.\n\nDrop this override.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n ci/lib.sh | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 82bc169ed7a..fbb13ca6c6a 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -406,7 +406,6 @@ linux-feature-testbed)\n \texport GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1\n \texport GIT_TEST_MULTI_PACK_INDEX=1\n \texport GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1\n-\texport GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\n \texport GIT_TEST_NO_WRITE_REV_INDEX=1\n \texport GIT_TEST_CHECKOUT_WORKERS=2\n \texport GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1\n\n-- \n2.56.0.500.g5d06dc02cd.dirty\n\n\n"},{"id":"557198","messageId":"0b0a3de3-b758-4a1b-b8a0-9804b362b261@gmail.com","threadId":"66676","inReplyTo":"20261102-b4-pks-ci-test-vars-consolidation-v2-0-a5485c437c62@pks.im","subject":"Re: [PATCH v2 0/7] ci: consolidate test variables","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2026-11-02T16:03:29Z","receivedAt":"2026-11-02T16:03:29Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Patrick\n\nOn 02/11/2026 11:17, Patrick Steinhardt wrote:\n> > The series is built on top of 37b3475fb53 (The 9th batch, 2026-10-25).\n> > Changes in v2:\n>    - Drop the last patch, as the reviewers seemed to favor an approach\n>      that's not compatible with my own use case for this change. We can\n>      still discuss this separately.\n\nFair enough, this is ready for next as far as I concerned\n\nThanks\n\nPhillip\n\n>    - Link to v1: https://patch.msgid.link/20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im\n> > Thanks!\n> > Patrick\n> > [1]: <20261008-pks-ci-housekeeping-v1-0-baf015c589c0@pks.im>\n> > ---\n> Patrick Steinhardt (7):\n>        ci: consolidate setup of test environment\n>        ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs\n>        ci/lib: deduplicate test variables by pattern matching\n>        ci/lib: merge switches for specific job names\n>        t: honor default ref storage format\n>        ci/lib: add another NO_RUST build using glibc\n>        ci: don't override initial branch name in testbed job\n> >   .github/workflows/main.yml |  3 ---\n>   .gitlab-ci.yml             |  3 ---\n>   ci/lib.sh                  | 44 ++++++++++++++++++++++++++++++++++++++++++--\n>   ci/run-build-and-tests.sh  | 44 --------------------------------------------\n>   t/test-lib-functions.sh    |  2 +-\n>   t/test-lib.sh              |  4 +++-\n>   6 files changed, 46 insertions(+), 54 deletions(-)\n> > Range-diff versus v1:\n> > 1:  a8727388da8 = 1:  3ba3d58ea4d ci: consolidate setup of test environment\n> 2:  ea243343552 = 2:  52c9d8d575b ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs\n> 3:  1751b336cbd = 3:  139a855e36b ci/lib: deduplicate test variables by pattern matching\n> 4:  b3ffcf0d81f = 4:  5c82ad5c76f ci/lib: merge switches for specific job names\n> 5:  db5d05f0743 = 5:  8329586dbb6 t: honor default ref storage format\n> 6:  0683eba847c = 6:  1f62c2fa8a4 ci/lib: add another NO_RUST build using glibc\n> 7:  8c2e6754773 = 7:  2f656a16971 ci: don't override initial branch name in testbed job\n> 8:  ea39ba888b8 < -:  ----------- t/test-lib: make feature-testbed job more accessible\n> > ---\n> base-commit: 37b3475fb530c14109211faca33716a173db61ed\n> change-id: 20261016-b4-pks-ci-test-vars-consolidation-8d0c6a53ca28\n\n\n"},{"id":"557407","messageId":"20261104063645.GC1543013@coredump.intra.peff.net","threadId":"66676","inReplyTo":"0b0a3de3-b758-4a1b-b8a0-9804b362b261@gmail.com","subject":"Re: [PATCH v2 0/7] ci: consolidate test variables","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2026-11-04T06:36:45Z","receivedAt":"2026-11-04T06:36:45Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Nov 02, 2026 at 04:03:29PM +0000, Phillip Wood wrote:\n\n> On 02/11/2026 11:17, Patrick Steinhardt wrote:\n> > \n> > The series is built on top of 37b3475fb53 (The 9th batch, 2026-10-25).\n> > \n> > Changes in v2:\n> >    - Drop the last patch, as the reviewers seemed to favor an approach\n> >      that's not compatible with my own use case for this change. We can\n> >      still discuss this separately.\n> \n> Fair enough, this is ready for next as far as I concerned\n\nMe too.\n\n-Peff\n\n"},{"id":"557488","messageId":"xmqqik2c1m8q.fsf@gitster.g","threadId":"66676","inReplyTo":"20261104063645.GC1543013@coredump.intra.peff.net","subject":"Re: [PATCH v2 0/7] ci: consolidate test variables","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-11-04T18:32:05Z","receivedAt":"2026-11-04T18:32:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Mon, Nov 02, 2026 at 04:03:29PM +0000, Phillip Wood wrote:\n>\n>> On 02/11/2026 11:17, Patrick Steinhardt wrote:\n>> > \n>> > The series is built on top of 37b3475fb53 (The 9th batch, 2026-10-25).\n>> > \n>> > Changes in v2:\n>> >    - Drop the last patch, as the reviewers seemed to favor an approach\n>> >      that's not compatible with my own use case for this change. We can\n>> >      still discuss this separately.\n>> \n>> Fair enough, this is ready for next as far as I concerned\n>\n> Me too.\n\nThanks, all.\n\n"}]}