kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

What's cooking (2025/01 #01)

todo
Junio C Hamano 2025-01-03 10:04:52 -08:00
parent 8765508c34
commit fae4c40e90
1 changed files with 139 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
whats-cooking.txt
View File

@ -1,10 +1,10 @@
To: git@vger.kernel.org To: git@vger.kernel.org
Subject: What's cooking in git.git (Dec 2024, #11; Mon, 30) Subject: What's cooking in git.git (Jan 2025, #01; Fri, 3)
X-master-at: bc2c65770dca70c1d4e151fad971bc7c7235a702 X-master-at: 1b4e9a5f8b5f048972c21fe8acafe0404096f694
X-next-at: 8677dc54d23642379db0014f8fa76565a086b1d5 X-next-at: b3e6e7acbc16ce8a8986ee84b24ad7d97f6017c4
Bcc: lwn@lwn.net, gitster@pobox.com Bcc: lwn@lwn.net, gitster@pobox.com


What's cooking in git.git (Dec 2024, #11; Mon, 30) What's cooking in git.git (Jan 2025, #01; Fri, 3)
-------------------------------------------------- --------------------------------------------------


Here are the topics that have been cooking in my tree. Commits Here are the topics that have been cooking in my tree. Commits
@ -55,6 +55,71 @@ Release tarballs are available at:
-------------------------------------------------- --------------------------------------------------
[New Topics] [New Topics]


* ja/doc-commit-markup-updates (2025-01-03) 3 commits
- doc: git-commit: migrate secondary files to new format
- doc: git-commit.txt: convert git commit config to new format
- doc: git-commit: apply new documentation guidelines

Doc updates.

source: <pull.1845.git.1735912046.gitgitgadget@gmail.com>


* jc/doc-opt-tilde-expand (2025-01-03) 1 commit
(merged to 'next' on 2025-01-03 at b3e6e7acbc)
+ gitcli.txt: typeset pathnames as monospace

Docfix.

Will merge to 'next' and then to 'master'.
source: <6e0abe96b60a94d4fdee15a45b7d53c2f44a0c69.1735903029.git.martin.agren@gmail.com>


* mh/doc-windows-home-env (2025-01-03) 1 commit
(merged to 'next' on 2025-01-03 at 1d4db69ce0)
+ git.txt: fix heading line of tildes

Docfix.

Will merge to 'next' and then to 'master'.
source: <50e47d14a8a0a2ca0dd158f01b833a28c7b46887.1735903029.git.martin.agren@gmail.com>


* ps/ci-misc-updates (2025-01-03) 10 commits
- ci: remove stale code for Azure Pipelines
- ci: use latest Ubuntu release
- ci: stop special-casing for Ubuntu 16.04
- gitlab-ci: add linux32 job testing against i386
- gitlab-ci: remove the "linux-old" job
- github: simplify computation of the job's distro
- github: convert all Linux jobs to be containerized
- github: adapt containerized jobs to be rootless
- t7422: fix flaky test caused by buffered stdout
- t0060: fix EBUSY in MinGW when setting up runtime prefix

CI updates (containerization, dropping stale ones, etc.).

source: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im>

--------------------------------------------------
[Graduated to 'master']

* jk/lsan-race-ignore-false-positive (2025-01-01) 5 commits
(merged to 'next' on 2025-01-02 at 7b5c9e281e)
+ test-lib: ignore leaks in the sanitizer's thread code
+ test-lib: check leak logs for presence of DEDUP_TOKEN
+ test-lib: simplify leak-log checking
+ test-lib: rely on logs to detect leaks
+ Revert barrier-based LSan threading race workaround

CI jobs that run threaded programs under LSan has been giving false
positives from time to time, which has been worked around.

This is an alternative to the jk/lsan-race-with-barrier topic with
much smaller change to the production code.
source: <20250101201226.GA3304465@coredump.intra.peff.net>


* jk/lsan-race-with-barrier (2024-12-30) 5 commits * jk/lsan-race-with-barrier (2024-12-30) 5 commits
(merged to 'next' on 2024-12-30 at 3fc0e14928) (merged to 'next' on 2024-12-30 at 3fc0e14928)
+ grep: work around LSan threading race with barrier + grep: work around LSan threading race with barrier
@ -65,38 +130,27 @@ Release tarballs are available at:


CI jobs that run threaded programs under LSan has been giving false CI jobs that run threaded programs under LSan has been giving false
positives from time to time, which has been worked around. positives from time to time, which has been worked around.

Will merge to 'master'.
source: <20241230042325.GA112439@coredump.intra.peff.net> source: <20241230042325.GA112439@coredump.intra.peff.net>




* ps/meson-weak-sha1-build (2024-12-30) 8 commits * ps/build-meson-html (2024-12-27) 12 commits
- meson: provide a summary of configured backends (merged to 'next' on 2025-01-02 at 115458a58b)
- meson: wire up unsafe SHA1 backend + Documentation: wire up sanity checks for Meson
- meson: add missing dots for build options + t/Makefile: make "check-meson" work with Dash
- meson: simplify conditions for HTTPS and SHA1 dependencies + meson: install static files for HTML documentation
- meson: require SecurityFramework when it's used as SHA1 backend + meson: generate articles
- meson: deduplicate access to SHA1/SHA256 backend options + Documentation: refactor "howto-index.sh" for out-of-tree builds
- meson: consistenlty spell 'CommonCrypto' + Documentation: refactor "api-index.sh" for out-of-tree builds
- Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build + meson: generate user manual
(this branch uses ps/weak-sha1-for-tail-sum-fix.) + Documentation: inline user-manual.conf
+ meson: generate HTML pages for all man page categories
+ meson: fix generation of merge tools
+ meson: properly wire up dependencies for our docs
+ meson: wire up support for AsciiDoctor


meson-based build now supports the unsafe-sha1 build knob. The build procedure based on meson learned to generate HTML

documention pages.
Will merge to 'next'. source: <20241227-b4-pks-meson-docs-v2-0-f61e63edbfa1@pks.im>
source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>


* ps/object-collision-check (2024-12-30) 1 commit
(merged to 'next' on 2024-12-30 at e083ea3154)
+ object-file: fix race in object collision check

CI jobs gave sporadic failures, which turns out that that the
object finalization code was giving an error when it did not have
to.

Will merge to 'master'.
source: <20241230-b4-pks-object-file-racy-collision-check-v1-1-11571294e60a@pks.im>




* ps/weak-sha1-for-tail-sum-fix (2024-12-30) 3 commits * ps/weak-sha1-for-tail-sum-fix (2024-12-30) 3 commits
@ -110,34 +164,55 @@ Release tarballs are available at:
sha1dc" topic had a few code paths that had initialized an sha1dc" topic had a few code paths that had initialized an
implementation of a hash function to be used by an unmatching hash implementation of a hash function to be used by an unmatching hash
by mistake, which have been corrected. by mistake, which have been corrected.

Will merge to 'master'.
source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im> source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>


--------------------------------------------------
[Graduated to 'master']


* ms/t7611-test-path-is-file (2024-12-27) 1 commit * rs/reftable-realloc-errors (2024-12-28) 4 commits
(merged to 'next' on 2024-12-28 at b08a0c8e23) (merged to 'next' on 2024-12-30 at ebc9625a4c)
+ t7611: replace test -f with test_path_is* helpers + t-reftable-merged: handle realloc errors
+ reftable: handle realloc error in parse_names()
+ reftable: fix allocation count on realloc error
+ reftable: avoid leaks on realloc error


Test modernization. The custom allocator code in the reftable library did not handle
failing realloc() very well, which has been addressed.
source: <20241227105345.10184-1-meetsoni3017@gmail.com> cf. <Z3JLdIG4C9D2-1ZT@pks.im>

source: <f4677194-0a3a-4f07-b003-c0295b51c100@web.de>

* ps/meson-test-wo-gitweb (2024-12-27) 3 commits
(merged to 'next' on 2024-12-28 at 39938f41fd)
+ meson: enable auto-discovered "gitweb"
+ GIT-BUILD-OPTIONS: wire up NO_GITWEB option
+ GIT-BUILD-OPTIONS: sort variables alphabetically

meson-based build without GitWeb failed the self tests.
source: <20241227-b4-pks-meson-wo-gitweb-v1-0-14ca8515bb3b@pks.im>


-------------------------------------------------- --------------------------------------------------
[Cooking] [Cooking]


* ps/meson-weak-sha1-build (2024-12-30) 8 commits
(merged to 'next' on 2025-01-01 at e01db872e4)
+ meson: provide a summary of configured backends
+ meson: wire up unsafe SHA1 backend
+ meson: add missing dots for build options
+ meson: simplify conditions for HTTPS and SHA1 dependencies
+ meson: require SecurityFramework when it's used as SHA1 backend
+ meson: deduplicate access to SHA1/SHA256 backend options
+ meson: consistenlty spell 'CommonCrypto'
+ Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build

meson-based build now supports the unsafe-sha1 build knob.

Will cook in 'next'.
source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>


* ps/object-collision-check (2025-01-03) 3 commits
- object-file: retry linking file into place when occluding file vanishes
- object-file: rename variables in `check_collision()`
(merged to 'next' on 2024-12-30 at e083ea3154)
+ object-file: fix race in object collision check

CI jobs gave sporadic failures, which turns out that that the
object finalization code was giving an error when it did not have
to.

source: <20241230-b4-pks-object-file-racy-collision-check-v1-1-11571294e60a@pks.im>
source: <20250103-b4-pks-object-file-racy-collision-check-v1-0-6ef9e2da1f87@pks.im>


* sk/strlen-returns-size_t (2024-12-26) 1 commit * sk/strlen-returns-size_t (2024-12-26) 1 commit
- date.c: Fix type missmatch warings from msvc - date.c: Fix type missmatch warings from msvc


@ -148,20 +223,21 @@ Release tarballs are available at:




* ps/more-sign-compare (2024-12-27) 10 commits * ps/more-sign-compare (2024-12-27) 10 commits
- sign-compare: avoid comparing ptrdiff with an int/unsigned (merged to 'next' on 2025-01-01 at 41c78cf690)
- commit-reach: use `size_t` to track indices when computing merge bases + sign-compare: avoid comparing ptrdiff with an int/unsigned
- shallow: fix -Wsign-compare warnings + commit-reach: use `size_t` to track indices when computing merge bases
- builtin/log: fix remaining -Wsign-compare warnings + shallow: fix -Wsign-compare warnings
- builtin/log: use `size_t` to track indices + builtin/log: fix remaining -Wsign-compare warnings
- commit-reach: use `size_t` to track indices in `get_reachable_subset()` + builtin/log: use `size_t` to track indices
- commit-reach: use `size_t` to track indices in `remove_redundant()` + commit-reach: use `size_t` to track indices in `get_reachable_subset()`
- commit-reach: fix type of `min_commit_date` + commit-reach: use `size_t` to track indices in `remove_redundant()`
- commit-reach: fix index used to loop through unsigned integer + commit-reach: fix type of `min_commit_date`
- prio-queue: fix type of `insertion_ctr` + commit-reach: fix index used to loop through unsigned integer
+ prio-queue: fix type of `insertion_ctr`


More -Wsign-compare fixes. More -Wsign-compare fixes.


Will merge to 'next'. Will cook in 'next'.
cf. https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/ cf. https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/
source: <20241227-b4-pks-commit-reach-sign-compare-v1-0-07c59c2aa632@pks.im> source: <20241227-b4-pks-commit-reach-sign-compare-v1-0-07c59c2aa632@pks.im>


@ -189,21 +265,6 @@ Release tarballs are available at:
source: <pull.1838.v2.git.1735380461980.gitgitgadget@gmail.com> source: <pull.1838.v2.git.1735380461980.gitgitgadget@gmail.com>




* rs/reftable-realloc-errors (2024-12-28) 4 commits
(merged to 'next' on 2024-12-30 at ebc9625a4c)
+ t-reftable-merged: handle realloc errors
+ reftable: handle realloc error in parse_names()
+ reftable: fix allocation count on realloc error
+ reftable: avoid leaks on realloc error

The custom allocator code in the reftable library did not handle
failing realloc() very well, which has been addressed.

Will merge to 'master'?
cf. <Z3JLdIG4C9D2-1ZT@pks.im>
source: <f4677194-0a3a-4f07-b003-c0295b51c100@web.de>


* jc/show-index-h-update (2024-12-20) 1 commit * jc/show-index-h-update (2024-12-20) 1 commit
- show-index: the short help should say the command reads from its input - show-index: the short help should say the command reads from its input


@ -236,27 +297,6 @@ Release tarballs are available at:
source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im> source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im>




* ps/build-meson-html (2024-12-27) 12 commits
- Documentation: wire up sanity checks for Meson
- t/Makefile: make "check-meson" work with Dash
- meson: install static files for HTML documentation
- meson: generate articles
- Documentation: refactor "howto-index.sh" for out-of-tree builds
- Documentation: refactor "api-index.sh" for out-of-tree builds
- meson: generate user manual
- Documentation: inline user-manual.conf
- meson: generate HTML pages for all man page categories
- meson: fix generation of merge tools
- meson: properly wire up dependencies for our docs
- meson: wire up support for AsciiDoctor

The build procedure based on meson learned to generate HTML
documention pages.

Needs review. On hold.
source: <20241227-b4-pks-meson-docs-v2-0-f61e63edbfa1@pks.im>


* jc/doc-attr-tree (2024-12-14) 1 commit * jc/doc-attr-tree (2024-12-14) 1 commit
- doc: give attr.tree a bit more visibility - doc: give attr.tree a bit more visibility