git, branch v2.49.0-rc1

Git 2.49-rc1

2025-03-04T16:19:20Z

Signed-off-by: Junio C Hamano

A few more before -rc1

2025-03-03T16:53:03Z

Signed-off-by: Junio C Hamano

Merge branch 'ps/build-meson-fixes'

2025-03-03T16:53:03Z

CI fix. * ps/build-meson-fixes: gitlab-ci: fix "msvc-meson" test job succeeding despite test failures

Merge branch 'ps/meson-contrib-bits'

2025-03-03T16:53:03Z

Update meson-based build procedure to cover contrib/ and other places as well. * ps/meson-contrib-bits: ci: exercise credential helpers ci: fix propagating UTF-8 test locale in musl-based Meson job meson: wire up static analysis via Coccinelle meson: wire up git-contacts(1) meson: wire up credential helpers contrib/credential: fix compilation of "osxkeychain" helper contrib/credential: fix compiling "libsecret" helper contrib/credential: fix compilation of wincred helper with MSVC contrib/credential: fix "netrc" tests with out-of-tree builds GIT-BUILD-OPTIONS: propagate project's source directory

Merge branch 'ms/merge-recursive-string-list-micro-optimization'

2025-03-03T16:53:02Z

Rename processing in the recursive merge backend has seen a micro optimization. * ms/merge-recursive-string-list-micro-optimization: merge-recursive: optimize time complexity for process_renames

Merge branch 'lo/doc-merge-submodule-update'

2025-03-03T16:53:02Z

What happens to submodules during merge has been documented in a bit more detail. * lo/doc-merge-submodule-update: merge-strategies.adoc: detail submodule merge

Merge branch 'ps/build-meson-fixes-0130'

2025-03-03T16:53:02Z

Assorted fixes and improvements to the build procedure based on meson. * ps/build-meson-fixes-0130: gitlab-ci: restrict maximum number of link jobs on Windows meson: consistently use custom program paths to resolve programs meson: fix overwritten `git` variable meson: prevent finding sed(1) in a loop meson: improve handling of `sane_tool_path` option meson: improve PATH handling meson: drop separate version library meson: stop linking libcurl into all executables meson: introduce `libgit_curl` dependency meson: simplify use of the common-main library meson: inline the static 'git' library meson: fix OpenSSL fallback when not explicitly required meson: fix exec path with enabled runtime prefix

Merge branch 'dk/test-aggregate-results-paste-fix'

2025-03-03T16:53:01Z

The use of "paste" command for aggregating the test results have been corrected. * dk/test-aggregate-results-paste-fix: t/aggregate-results: fix paste(1) invocation

A bit more post -rc0

2025-02-27T23:23:01Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/3.0-branches-remotes-update'

2025-02-27T23:23:01Z

Removal of ".git/branches" and ".git/remotes" support in the BreakingChanges document has been further clarified. * jc/3.0-branches-remotes-update: BreakingChanges: clarify branches/ and remotes/