Skip to content

Commit b5301d5

Browse files
committed
What's cooking (2025/01 #3)
1 parent d658653 commit b5301d5

File tree

1 file changed

+231
-55
lines changed

1 file changed

+231
-55
lines changed

whats-cooking.txt

Lines changed: 231 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
2-
Subject: What's cooking in git.git (Jan 2025, #02; Mon, 6)
3-
X-master-at: b74ff38af58464688b211140b90ec90598d340c6
4-
X-next-at: 9ec6785566993ea05d28010e7a742dc2d8f0daae
2+
Subject: What's cooking in git.git (Jan 2025, #03; Fri, 10)
3+
X-master-at: fbe8d3079d4a96aeb4e4529cc93cc0043b759a05
4+
X-next-at: d3603152ad074a50ed6022133a71b91a16cc7baf
55
66

7-
What's cooking in git.git (Jan 2025, #02; Mon, 6)
7+
What's cooking in git.git (Jan 2025, #03; Fri, 10)
88
--------------------------------------------------
99

1010
Here are the topics that have been cooking in my tree. Commits
@@ -17,10 +17,13 @@ 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-
Git 2.48-rc2 has been tagged. I expect there will be a few more
21-
"finishing touches" before the final release is tagged later this
22-
week. Extra testing the tip of 'master' before we actually tag it
23-
is as always very much appreciated.
20+
Git 2.48.0 has been tagged. Thank you, everybody, for your hard
21+
work.
22+
23+
There are quite a few topics that are listed here but without much
24+
review activities. I'll review the notes below with list archive
25+
myself to see which ones are truly stale and discard them, maybe
26+
later next week.
2427

2528
Copies of the source code to Git live in many repositories, and the
2629
following is a list of the ones I push into or their mirrors. Some
@@ -53,60 +56,232 @@ Release tarballs are available at:
5356
--------------------------------------------------
5457
[Graduated to 'master']
5558

56-
* jc/doc-opt-tilde-expand (2025-01-03) 1 commit
57-
(merged to 'next' on 2025-01-03 at b3e6e7acbc)
58-
+ gitcli.txt: typeset pathnames as monospace
59+
* bf/fetch-set-head-config (2025-01-06) 1 commit
60+
(merged to 'next' on 2025-01-06 at 841c3a38a6)
61+
+ fetch: fix erroneous set_head advice message
5962

60-
Docfix.
63+
A hotfix on an advice message added during this cycle.
64+
6165

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

67+
* js/git-version-gen-update (2025-01-10) 1 commit
68+
(merged to 'next' on 2025-01-10 at e4c4bf6b44)
69+
+ GIT-VERSION-GEN: allow it to be run in parallel
6570

66-
* mh/doc-windows-home-env (2025-01-03) 1 commit
67-
(merged to 'next' on 2025-01-03 at 1d4db69ce0)
68-
+ git.txt: fix heading line of tildes
71+
Build regression fix.
72+
73+
source: <pull.1850.v2.git.[email protected]>
6974

70-
Docfix.
7175

72-
Will merge to 'next' and then to 'master'.
73-
source: <50e47d14a8a0a2ca0dd158f01b833a28c7b46887.1735903029.git.martin.agren@gmail.com>
76+
* js/reftable-realloc-errors-fix (2025-01-08) 1 commit
77+
(merged to 'next' on 2025-01-08 at 5efe7e2f5d)
78+
+ t-reftable-basics: allow for `malloc` to be `#define`d
79+
80+
Last-minute fix to a recent update.
81+
82+
83+
84+
* ps/build-sign-compare (2025-01-10) 2 commits
85+
(merged to 'next' on 2025-01-10 at 8b4d916cbf)
86+
+ builtin/blame: fix out-of-bounds write with blank boundary commits
87+
+ builtin/blame: fix out-of-bounds read with excessive `--abbrev`
88+
89+
Last-minute fix for a regression in "git blame --abbrev=<length>"
90+
when insane <length> is specified; we used to correctly cap it to
91+
the hash output length but broke it during the cycle.
92+
93+
source: <20250110-b4-pks-blame-truncate-hash-length-v3-0-e61f25b68f30@pks.im>
94+
95+
96+
* sj/meson-perl-build-fix (2025-01-08) 1 commit
97+
(merged to 'next' on 2025-01-08 at cce5ed7397)
98+
+ meson: fix perl dependencies
99+
100+
The build procedure in "meson" for the "perl/" hierarchy lacked
101+
necessary dependencies, which has been corrected.
102+
source: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307757.git.sam@gentoo.org>
74103

75104
--------------------------------------------------
76105
[New Topics]
77106

107+
* dk/zsh-config-completion-fix (2025-01-06) 1 commit
108+
(merged to 'next' on 2025-01-10 at efba7d534c)
109+
+ completion: repair config completion for Zsh
110+
111+
Completion script updates for zsh
112+
113+
Will cook in 'next'.
114+
115+
116+
117+
* en/object-name-with-funny-refname-fix (2025-01-06) 2 commits
118+
- object-name: be more strict in parsing describe-like output
119+
- object-name: fix resolution of object names containing curly braces
120+
121+
Extended SHA-1 expression parser did not work well when a branch
122+
with an unusual name (e.g. "foo{bar") is involved.
123+
124+
Expecting a reroll.
125+
cf. <CABPp-BHyWgu47mCDH_f_MkS4CMGh_OtX4K-YGFsB-fZvvaNJPQ@mail.gmail.com>
126+
127+
128+
129+
* sj/ref-consistency-checks-more (2025-01-06) 10 commits
130+
- builtin/fsck: add `git refs verify` child process
131+
- packed-backend: check whether the "packed-refs" is sorted
132+
- packed-backend: add check for object consistency
133+
- packed-backend: create "fsck_packed_ref_entry" to store parsing info
134+
- packed-backend: add "packed-refs" entry consistency check
135+
- packed-backend: check whether the refname contains NULL binaries
136+
- packed-backend: add "packed-refs" header consistency check
137+
- packed-backend: check whether the "packed-refs" is regular
138+
- builtin/refs.h: get worktrees without reading head info
139+
- files-backend: add object check for regular ref
140+
141+
"git fsck" becomes more careful when checking the refs.
142+
source: <Z3qNUizvHJLgMx1y@ArchLinux>
143+
144+
145+
* jk/lsan-race-ignore-false-positive (2025-01-07) 3 commits
146+
(merged to 'next' on 2025-01-09 at 3d7cd910b5)
147+
+ test-lib: add a few comments to LSan log checking
148+
+ test-lib: simplify lsan results check
149+
+ test-lib: invert return value of check_test_results_san_file_empty
150+
151+
The code to check LSan results has been simplified and made more
152+
robust.
153+
154+
Will cook in 'next'.
155+
156+
157+
158+
* jk/t7407-use-test-grep (2025-01-07) 1 commit
159+
(merged to 'next' on 2025-01-09 at 1d584ee42d)
160+
+ t7407: use test_grep
161+
162+
Test clean-up.
163+
164+
Will cook in 'next'.
165+
166+
167+
168+
* jt/fsck-skiplist-parse-fix (2025-01-07) 1 commit
169+
(merged to 'next' on 2025-01-09 at d08b30fd78)
170+
+ fsck: reject misconfigured fsck.skipList
171+
172+
A misconfigured "fsck.skiplist" configuration variable was not
173+
diagnosed as an error, which has been corrected.
174+
175+
Will cook in 'next'.
176+
177+
178+
179+
* ps/reftable-get-random-fix (2025-01-07) 2 commits
180+
(merged to 'next' on 2025-01-09 at bc024b7a45)
181+
+ reftable/stack: accept insecure random bytes
182+
+ wrapper: allow generating insecure random bytes
183+
184+
The code to compute "unique" name used git_rand() which can fail or
185+
get stuck; the callsite does not require cryptographic security.
186+
Introduce the "insecure" mode and use it appropriately.
187+
188+
Will cook in 'next'.
189+
190+
191+
192+
* mh/credential-cache-authtype-request-fix (2025-01-09) 1 commit
193+
- credential-cache: respect authtype capability
194+
195+
The "cache" credential back-end did not handle authtype correctly,
196+
which has been corrected.
197+
198+
199+
200+
* mh/gitattr-doc-markup-fix (2025-01-07) 1 commit
201+
(merged to 'next' on 2025-01-10 at 9b8f84ebe2)
202+
+ docs: fix typesetting of merge driver placeholders
203+
204+
Doc markup fix.
205+
206+
Will cook in 'next'.
207+
source: <20250107212421.7yyvuzw4uqxnqv7t@archP14s>
208+
209+
210+
* sk/unit-test-hash (2025-01-09) 1 commit
211+
- t/unit-tests: convert hash to use clar test framework
212+
213+
Test update.
214+
215+
Will merge to 'next'.
216+
217+
218+
219+
* aj/difftool-config-doc-fix (2025-01-09) 1 commit
220+
(merged to 'next' on 2025-01-10 at b8902a53d1)
221+
+ difftool docs: restore correct position of tool list
222+
223+
Docfix.
224+
225+
Will cook in 'next'.
226+
227+
228+
229+
* jk/combine-diff-cleanup (2025-01-09) 14 commits
230+
- tree-diff: make list tail-passing more explicit
231+
- tree-diff: simplify emit_path() list management
232+
- tree-diff: use the name "tail" to refer to list tail
233+
- tree-diff: drop list-tail argument to diff_tree_paths()
234+
- combine-diff: drop public declaration of combine_diff_path_size()
235+
- tree-diff: inline path_appendnew()
236+
- tree-diff: pass whole path string to path_appendnew()
237+
- tree-diff: drop path_appendnew() alloc optimization
238+
- run_diff_files(): de-mystify the size of combine_diff_path struct
239+
- diff: add a comment about combine_diff_path.parent.path
240+
- combine-diff: use pointer for parent paths
241+
- tree-diff: clear parent array in path_appendnew()
242+
- combine-diff: add combine_diff_path_new()
243+
- run_diff_files(): delay allocation of combine_diff_path
244+
245+
Code clean-up for code paths around combined diff.
246+
247+
248+
249+
* sc/help-autocorrect-one (2025-01-09) 1 commit
250+
- help: interpret help.autocorrect=1 as "immediate" rather than 0.1s
251+
252+
"[help] autocorrect = 1" used to be a way to say "please wait for
253+
0.1 second after suggesting a typofix of the command name before
254+
running that command"; now it means "yes, if there is a plausible
255+
typofix for the command name, please run it immediately".
256+
257+
Expecting a reroll.
258+
Almost there.
259+
260+
261+
--------------------------------------------------
262+
[Cooking]
263+
78264
* ja/doc-notes-markup-updates (2025-01-03) 1 commit
79265
- doc: git-notes.txt: migrate to new documentation format
80266

81267
Doc mark-up updates.
82-
83268
84269

85270

86271
* mb/t7110-use-test-path-helper (2025-01-03) 1 commit
87-
- t7110: replace `test -f` with `test_path_is_*` helpers
272+
(merged to 'next' on 2025-01-06 at cd96b0ac82)
273+
+ t7110: replace `test -f` with `test_path_is_*` helpers
88274

89275
Test modernization.
90276

91-
Will merge to 'next'.
277+
Will cook in 'next'.
92278
93279

94280

95-
* bf/fetch-set-head-config (2025-01-06) 1 commit
96-
(merged to 'next' on 2025-01-06 at 841c3a38a6)
97-
+ fetch: fix erroneous set_head advice message
98-
99-
A hotfix on an advice messagge added during this cycle.
100-
101-
Will merge to 'master'.
102-
103-
104-
105281
* ja/doc-restore-markup-update (2025-01-04) 1 commit
106282
- doc: git-restore: migrate to new style format
107283

108284
Doc mark-up updates.
109-
110285
111286

112287

@@ -118,11 +293,8 @@ Release tarballs are available at:
118293

119294
The value of "uname -s" is by default sent over the wire as a new
120295
capability, with an opt-out for privacy-concious folks.
121-
122296
123297

124-
--------------------------------------------------
125-
[Cooking]
126298

127299
* ja/doc-commit-markup-updates (2025-01-03) 3 commits
128300
- doc: git-commit: migrate secondary files to new format
@@ -133,7 +305,7 @@ Release tarballs are available at:
133305
134306

135307

136-
* ps/ci-misc-updates (2025-01-06) 10 commits
308+
* ps/ci-misc-updates (2025-01-10) 10 commits
137309
- ci: remove stale code for Azure Pipelines
138310
- ci: use latest Ubuntu release
139311
- ci: stop special-casing for Ubuntu 16.04
@@ -146,7 +318,7 @@ Release tarballs are available at:
146318
- t0060: fix EBUSY in MinGW when setting up runtime prefix
147319

148320
CI updates (containerization, dropping stale ones, etc.).
149-
source: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im>
321+
source: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im>
150322

151323

152324
* ps/meson-weak-sha1-build (2024-12-30) 8 commits
@@ -177,6 +349,8 @@ Release tarballs are available at:
177349
CI jobs gave sporadic failures, which turns out that that the
178350
object finalization code was giving an error when it did not have
179351
to.
352+
353+
Will cook in 'next'.
180354
source: <20250106-b4-pks-object-file-racy-collision-check-v2-0-8b3984ecbb18@pks.im>
181355

182356

@@ -242,24 +416,27 @@ Release tarballs are available at:
242416

243417

244418
* ps/the-repository (2024-12-18) 15 commits
245-
- match-trees: stop using `the_repository`
246-
- graph: stop using `the_repository`
247-
- add-interactive: stop using `the_repository`
248-
- tmp-objdir: stop using `the_repository`
249-
- resolve-undo: stop using `the_repository`
250-
- credential: stop using `the_repository`
251-
- mailinfo: stop using `the_repository`
252-
- diagnose: stop using `the_repository`
253-
- server-info: stop using `the_repository`
254-
- send-pack: stop using `the_repository`
255-
- serve: stop using `the_repository`
256-
- trace: stop using `the_repository`
257-
- pager: stop using `the_repository`
258-
- progress: stop using `the_repository`
259-
- Merge branch 'ps/build-sign-compare' into ps/the-repository
419+
(merged to 'next' on 2025-01-09 at 1de40edade)
420+
+ match-trees: stop using `the_repository`
421+
+ graph: stop using `the_repository`
422+
+ add-interactive: stop using `the_repository`
423+
+ tmp-objdir: stop using `the_repository`
424+
+ resolve-undo: stop using `the_repository`
425+
+ credential: stop using `the_repository`
426+
+ mailinfo: stop using `the_repository`
427+
+ diagnose: stop using `the_repository`
428+
+ server-info: stop using `the_repository`
429+
+ send-pack: stop using `the_repository`
430+
+ serve: stop using `the_repository`
431+
+ trace: stop using `the_repository`
432+
+ pager: stop using `the_repository`
433+
+ progress: stop using `the_repository`
434+
+ Merge branch 'ps/build-sign-compare' into ps/the-repository
260435

261436
More code paths have a repository passed through the callchain,
262437
instead of assuming the primary the_repository object.
438+
439+
Will cook in 'next'.
263440
source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im>
264441

265442

@@ -287,7 +464,6 @@ Release tarballs are available at:
287464
changes for Git 3.0, allow an early opt-in for removing support of
288465
$GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure
289466
remotes.
290-
291467
source: <20250106-pks-remote-branches-deprecation-v2-0-2ce87c053536@pks.im>
292468

293469

0 commit comments

Comments
 (0)