Skip to content

Commit ecac596

Browse files
committed
What's cooking (2024/12 #10)
1 parent bbda434 commit ecac596

File tree

1 file changed

+92
-21
lines changed

1 file changed

+92
-21
lines changed

whats-cooking.txt

Lines changed: 92 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
2-
Subject: What's cooking in git.git (Dec 2024, #09; Thu, 26)
3-
X-master-at: 76cf4f61c87855ebf0784b88aaf737d6b09f504b
4-
X-next-at: b6c66824c156363e934b3d989fb123efb1a9c63d
2+
Subject: What's cooking in git.git (Dec 2024, #10; Sat, 28)
3+
X-master-at: df2faf1a65fc821384e618b3c291a184fbed039e
4+
X-next-at: bfe548d87ed7786f06c2d9519f69c38ed47176e6
55
66

7-
What's cooking in git.git (Dec 2024, #09; Thu, 26)
7+
What's cooking in git.git (Dec 2024, #10; Sat, 28)
88
--------------------------------------------------
99

1010
Here are the topics that have been cooking in my tree. Commits
@@ -17,14 +17,10 @@ topic without enough support may be discarded after a long period of
1717
no activity (of course they can be resubmit when new interests
1818
arise).
1919

20-
Let's wait for gitk and possibly po/ and delay the tagging of the
21-
-rc1. Many people are already offline for the end-of-year holidays
22-
and it is a slow week, and 'master' front has too many new things
23-
graduated from 'next' a bit too early for me to feel comfortable.
20+
Hopefully we can tag -rc1 40-hours+ from now.
2421

2522
Extra testing the tip of 'master' before we actually tag it is as
26-
always very much appreciated. Right now, the optional meson-based
27-
build does not pass gitweb tests, IIUC.
23+
always very much appreciated.
2824

2925
Copies of the source code to Git live in many repositories, and the
3026
following is a list of the ones I push into or their mirrors. Some
@@ -55,33 +51,107 @@ Release tarballs are available at:
5551
https://www.kernel.org/pub/software/scm/git/
5652

5753
--------------------------------------------------
58-
[New Topics]
54+
[Graduated to 'master']
5955

6056
* as/gitk-git-gui-repo-update (2024-12-26) 1 commit
6157
(merged to 'next' on 2024-12-26 at 10b9e8227b)
6258
+ Update the official repo of gitk
6359

6460
The developer documentation has been updated to give the latest
6561
info on gitk and git-gui maintainer.
62+
63+
64+
65+
--------------------------------------------------
66+
[New Topics]
67+
68+
* sk/strlen-returns-size_t (2024-12-26) 1 commit
69+
- date.c: Fix type missmatch warings from msvc
70+
71+
Code clean-up.
72+
73+
The remainder needs to be reviewed.
74+
75+
76+
77+
* ms/t7611-test-path-is-file (2024-12-27) 1 commit
78+
(merged to 'next' on 2024-12-28 at b08a0c8e23)
79+
+ t7611: replace test -f with test_path_is* helpers
80+
81+
Test modernization.
6682

6783
Will merge to 'master'.
68-
84+
85+
86+
87+
* ps/meson-test-wo-gitweb (2024-12-27) 3 commits
88+
(merged to 'next' on 2024-12-28 at 39938f41fd)
89+
+ meson: enable auto-discovered "gitweb"
90+
+ GIT-BUILD-OPTIONS: wire up NO_GITWEB option
91+
+ GIT-BUILD-OPTIONS: sort variables alphabetically
92+
93+
meson-based build without GitWeb failed the self tests.
94+
95+
Will merge to 'master'.
96+
6997

7098

71-
* rs/reftable-realloc-errors (2024-12-26) 4 commits
72-
- t-reftable-merged: check realloc errors
99+
* ps/more-sign-compare (2024-12-27) 10 commits
100+
- sign-compare: avoid comparing ptrdiff with an int/unsigned
101+
- commit-reach: use `size_t` to track indices when computing merge bases
102+
- shallow: fix -Wsign-compare warnings
103+
- builtin/log: fix remaining -Wsign-compare warnings
104+
- builtin/log: use `size_t` to track indices
105+
- commit-reach: use `size_t` to track indices in `get_reachable_subset()`
106+
- commit-reach: use `size_t` to track indices in `remove_redundant()`
107+
- commit-reach: fix type of `min_commit_date`
108+
- commit-reach: fix index used to loop through unsigned integer
109+
- prio-queue: fix type of `insertion_ctr`
110+
111+
More -Wsign-compare fixes.
112+
113+
Expecting a reroll?
114+
115+
cf. https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/
116+
source: <20241227-b4-pks-commit-reach-sign-compare-v1-0-07c59c2aa632@pks.im>
117+
118+
119+
* as/long-option-help-i18n (2024-12-28) 2 commits
120+
- SQUASH???
121+
- parse-options: localize mark-up of placeholder text in the short help
122+
123+
Tweak the help text used for the option value placeholders by
124+
parse-options API so that translations can customize the "<>"
125+
placeholder signal (e.g. "--option=<value>").
126+
127+
Will merge to 'next' after squashing the fix-up in?
128+
129+
130+
131+
* sk/maintenance-remote-prune (2024-12-28) 1 commit
132+
- maintenance: add prune-remote-refs task
133+
134+
A new periodic maintenance task to run "git remote prune" has been
135+
introduced.
136+
137+
Will merge to 'next'?
138+
139+
140+
--------------------------------------------------
141+
[Cooking]
142+
143+
* rs/reftable-realloc-errors (2024-12-28) 4 commits
144+
- t-reftable-merged: handle realloc errors
73145
- reftable: handle realloc error in parse_names()
74146
- reftable: fix allocation count on realloc error
75147
- reftable: avoid leaks on realloc error
76148

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

80-
Needs review.
81-
source: <2b9fba8d-be63-4145-9d25-a2151e422cfa@web.de>
152+
Will merge to 'next'?
153+
source: <f4677194-0a3a-4f07-b003-c0295b51c100@web.de>
82154

83-
--------------------------------------------------
84-
[Cooking]
85155

86156
* jc/show-index-h-update (2024-12-20) 1 commit
87157
- show-index: the short help should say the command reads from its input
@@ -115,7 +185,9 @@ Release tarballs are available at:
115185
source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im>
116186

117187

118-
* ps/build-meson-html (2024-12-13) 11 commits
188+
* ps/build-meson-html (2024-12-27) 12 commits
189+
- Documentation: wire up sanity checks for Meson
190+
- t/Makefile: make "check-meson" work with Dash
119191
- meson: install static files for HTML documentation
120192
- meson: generate articles
121193
- Documentation: refactor "howto-index.sh" for out-of-tree builds
@@ -126,13 +198,12 @@ Release tarballs are available at:
126198
- meson: fix generation of merge tools
127199
- meson: properly wire up dependencies for our docs
128200
- meson: wire up support for AsciiDoctor
129-
- Merge branch 'ps/build' into ps/build-meson-html
130201

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

134205
Needs review. On hold.
135-
source: <20241213-b4-pks-meson-docs-v1-0-0c7895952cd3@pks.im>
206+
source: <20241227-b4-pks-meson-docs-v2-0-f61e63edbfa1@pks.im>
136207

137208

138209
* jc/doc-attr-tree (2024-12-14) 1 commit

0 commit comments

Comments
 (0)