git/ci, branch jch

Merge branch 'jc/ci-enable-expensive' into jch

2026-05-17T13:58:44Z

Enable expensive tests to catch topics that may cause breakages on integration branches closer to their origin in the contributor PR builds. * jc/ci-enable-expensive: ci: enable EXPENSIVE for contributor builds

Merge branch 'js/objects-larger-than-4gb-on-windows' into jch

2026-05-17T13:58:41Z

Update code paths that assumed "unsigned long" was long enough for "size_t". * js/objects-larger-than-4gb-on-windows: ci: run expensive tests on push builds to integration branches t5608: mark >4GB tests as EXPENSIVE test-tool synthesize: add precomputed SHA-256 pack for 4 GiB + 1 test-tool synthesize: precompute pack for 4 GiB + 1 test-tool synthesize: use the unsafe hash for speed t5608: add regression test for >4GB object clone test-tool: add a helper to synthesize large packfiles delta, packfile: use size_t for delta header sizes odb, packfile: use size_t for streaming object sizes git-zlib: handle data streams larger than 4GB index-pack, unpack-objects: use size_t for object size

Merge branch 'ps/test-set-e-clean'

2026-05-11T01:05:54Z

The test suite harness and many individual test scripts have been updated to work correctly when 'set -e' is in effect, which helps detect misspelled test commands. * ps/test-set-e-clean: t: detect errors outside of test cases t9902: fix use of `read` with `set -e` t6002: fix use of `expr` with `set -e` t1301: don't fail in case setfacl(1) doesn't exist or fails t0008: silence error in subshell when using `grep -v` t: prepare `test_when_finished ()`/`test_atexit()` for `set -e` t: prepare execution of potentially failing commands for `set -e` t: prepare conditional test execution for `set -e` t: prepare `git config --unset` calls for `set -e` t: prepare `stop_git_daemon ()` for `set -e` t: prepare `test_must_fail ()` for `set -e` t: prepare `test_match_signal ()` calls for `set -e`

ci: enable EXPENSIVE for contributor builds

2026-05-11T00:06:48Z

Earlier, we enabled EXPENSIVE tests for pushes to integration branches. As we didn't have any CI jobs that run these tests, this was a step in the right direction. It however is an ineffective and inefficient use of the maintainer time, which does not scale, to allow contributors to send changes that are less tested at the list, only to force the maintainer notice breakages caused by their changes but only after these changes are mixed with changes from other contributors. The problematic topic needs to be isolated by bisecting, and it historically has been done by the maintainer alone. It is far better to let the problem identified early, preferably before the problematic code leaves the hands of the original developer. In order for it to happen, the test coverage of the contributor tests must be at least as wide as the coverage of the integration tests. Enable expensive tests for CI jobs triggered by pull requests. This will make each contributor take care of their own, which scales much better. Keep the expensive tests also enabled for the pushes of integration branches, as that is the only place we can notice problems stemming from mismerges and inter-topic interactions, even if the topics from the contributors in isolation all passes these tests. Signed-off-by: Junio C Hamano

ci: run expensive tests on push builds to integration branches

2026-05-09T02:25:32Z

Derrick Stolee suggested [1] that expensive tests should be run at a regular cadence rather than on every PR iteration. Gate GIT_TEST_LONG on push builds to the integration branches (next, master, main, maint) so that the EXPENSIVE prereq is satisfied there but not during PR validation, where the extra minutes of wall-clock time do not justify themselves. [1] https://lore.kernel.org/git/e1e8837f-7374-4079-ba87-ab95dd156e33@gmail.com/ Helped-by: Derrick Stolee Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

t: detect errors outside of test cases

2026-04-22T22:53:36Z

We have recently merged a patch series that had a simple misspelling of `test_expect_success`. Instead of making our tests fail though, this typo went completely undetected and all of our tests passed, which is of course unfortunate. This is a more general issue with our test suite: all commands that run outside of a specific test case can fail, and if we don't explicitly check for such failure then this failure will be silently ignored. Improve the status quo by enabling the errexit option so that any such unchecked failures will cause us to abort immediately. Note that for now, we only enable this option for Bash 5 and newer. This is because other shells have wildly different behaviour, and older versions of Bash (especially on macOS) are buggy. The list of enabled shells may be extended going forward. Helped-by: Jeff King Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

Enable Rust by default

2026-04-10T00:25:36Z

Our breaking changes document says that we'll enable Rust by default in Git 2.54. Adjust the Makefile to switch the option from WITH_RUST to NO_RUST to enable it by default and update the help text accordingly. Similarly, for Meson, enable the option by default and do not automatically disable it if Cargo is missing, since the goal is to help users find where they are likely to have problems in the future. Update our CI tests to swap out the single Linux job with Rust to a single job without, both for Makefile and Meson. Similarly, update the Windows Makefile job to not use Rust, while the Meson job (which does not build with ci/lib.sh) will default to having it enabled. Move the check for Cargo in the Meson build because it is no longer needed in the main script. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

ci: install cargo on Alpine

2026-04-10T00:25:36Z

We'll make Rust the default in a future commit, so be sure to install Cargo (which will also install Rust) to prepare for that case. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Merge branch 'ps/build-tweaks'

2026-03-27T18:00:01Z

Tweak the build infrastructure by moving tools around. * ps/build-tweaks: meson: precompile "git-compat-util.h" meson: compile compatibility sources separately git-compat-util.h: move warning infra to prepare for PCHs builds: move build scripts into "tools/" contrib: move "update-unicode.sh" script into "tools/" contrib: move "coverage-diff.sh" script into "tools/" contrib: move "coccinelle/" directory into "tools/" Introduce new "tools/" directory

contrib: move "coccinelle/" directory into "tools/"

2026-03-19T13:40:08Z

The Coccinelle tool is an ingrained part of our build infrastructure. It is executed by our CI to detect antipatterns and is used to detect misuses of certain interfaces. It's presence in "contrib/" is thus rather misleading. Promote the configuration into the new "tools/" directory. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano