What's cooking (2025/06 #04)
Junio C Hamano committed
Jun 12, 2025 at 15:11 UTC
3a0467ce5db3b007f1406fd57a8a667bf4886141
1 file changed
+175
-81
whats-cooking.txt
+175
-81
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2025, #03; Mon, 9)
3
-X-master-at: 4c0e625c091d4c648cec7319bafaed3cc81658e5
4
-X-next-at: 299adb869395ee10d8b4c20bedb588a59fa98455
2
+Subject: What's cooking in git.git (Jun 2025, #04; Thu, 12)
3
+X-master-at: 9edff09aec9b5aaa3d5528129bb279a4d34cf5b3
4
+X-next-at: 9a244e597829f0322c0da9a0f1a15fecc86eae1d
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jun 2025, #03; Mon, 9)
7
+What's cooking in git.git (Jun 2025, #04; Thu, 12)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,15 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
+We are almost done with this cycle. As we found out a ntohll
21
+regression that broke big endian boxes with builtin_bswap32/64
22
+supplied by their compilers way too late in the cycle, I'm planning
23
+to queue a revert for a single patch, which may or may not break
24
+Windows ARM64 support that was newly added during this cycle.
25
+Hopefully it is a better tradeoff for the entire Git community to
26
+drop support added by an unreleased product than to break a platform
27
+that has been working OK.
28
+
29
Copies of the source code to Git live in many repositories, and the
30
following is a list of the ones I push into or their mirrors. Some
31
repositories have only a subset of branches.
@@ -48,19 +57,154 @@ Release tarballs are available at:
57
--------------------------------------------------
58
[Graduated to 'master']
59
51
-* mm/test-in-absolute-home (2025-05-28) 1 commit
52
- (merged to 'next' on 2025-06-05 at ae6cc48f8d)
53
- + t: run tests from a normalized working directory
60
+* kh/maintenance-missing-tasks-docfix (2025-06-09) 1 commit
61
+ (merged to 'next' on 2025-06-10 at 4d6d3d6af8)
62
+ + doc: maintenance: fix linkgit syntax
63
55
- Tests that compare $HOME and $(pwd), which should be the same
56
- directory unless the tests chdir's around, would fail when the user
57
- enters the test directory via symbolic links, which has been
58
- corrected.
59
- source: <20250528201737.55268-1-mark@chromium.org>
64
+ Doc mark-up fix for a topic that has graduated to 'master'.
65
+ source: <567195e5577c6c32b46f784a797fbf366873a0f3.1749484736.git.code@khaugsbakk.name>
66
67
--------------------------------------------------
68
[New Topics]
69
70
+* ow/rebase-verify-insn-fmt-before-initializing-state (2025-06-09) 1 commit
71
+ - rebase: write script before initializing state
72
+
73
+ "git rebase -i" with bogus rebase.instructionFormat configuration
74
+ failed to produce the todo file after recording the state files,
75
+ leading to confused "git status"; this has been corrected.
76
+
77
+ Comments?
78
+ source: <20250609221055.136074-1-oystwa@gmail.com>
79
+
80
+
81
+* rj/meson-tap-parse-fixup (2025-06-09) 1 commit
82
+ (merged to 'next' on 2025-06-10 at 1fc2a0284f)
83
+ + test-lib: add missing prerequisites for Darwin
84
+ (this branch uses ps/meson-tap-parse.)
85
+
86
+ An earlier test update incorrectly lost three prerequisites on
87
+ macOS, which has been corrected.
88
+
89
+ Will cook in 'next'.
90
+ source: <20250602-pks-meson-tap-v4-0-052dfde0818a@pks.im>
91
+
92
+
93
+* ac/preload-index-wo-the-repository (2025-06-10) 2 commits
94
+ - preload-index: stop depending on 'the_repository'
95
+ - environment: remove the global variable 'core_preload_index'
96
+
97
+ Code clean-up.
98
+
99
+ Will merge to 'next'?
100
+ source: <cover.1749557133.git.ayu.chandekar@gmail.com>
101
+
102
+
103
+* jc/cg-let-bss-do-its-job (2025-06-11) 1 commit
104
+ - CodingGuidelines: let BSS do its job
105
+
106
+ Clarify "do not explicitly initialize to zero" rule in the
107
+ CodingGuidelines document.
108
+
109
+ Will merge to 'next'.
110
+ source: <xmqqh60mger9.fsf@gitster.g>
111
+
112
+
113
+* jc/merge-compact-summary (2025-06-11) 2 commits
114
+ - merge/pull: extend merge.stat configuration variable to cover --compact-summary
115
+ - merge/pull: --compact-summary
116
+
117
+
118
+* js/github-ci-win-coverity-fix (2025-06-11) 2 commits
119
+ - ci(coverity): output the build log upon error
120
+ - ci(coverity): fix building on Windows
121
+
122
+ Fixes for GitHub Actions Coverity job.
123
+
124
+ Will merge to 'next' and then to 'master'.
125
+ source: <pull.1934.v2.git.1749657278.gitgitgadget@gmail.com>
126
+
127
+
128
+* ly/prepare-show-merge-leakfix (2025-06-09) 1 commit
129
+ - revision: fix memory leak in prepare_show_merge()
130
+
131
+ Leakfix.
132
+
133
+ Will merge to 'next'.
134
+ source: <pull.1989.v3.git.git.1749515879546.gitgitgadget@gmail.com>
135
+
136
+
137
+* sa/multi-mailmap-fix (2025-06-10) 1 commit
138
+ - cat-file: fix mailmap application for different author and committer
139
+
140
+ When asking to apply mailmap to both author and committer field
141
+ while showing a commit object, the field that appears later was not
142
+ correctly parsed and replaced, which has been corrected.
143
+
144
+ Will merge to 'next'?
145
+ source: <20250611062643.8639-1-siddharthasthana31@gmail.com>
146
+
147
+
148
+* bs/config-mak-freebsd (2025-06-11) 1 commit
149
+ - config.mak.uname: update settings for FreeBSD
150
+
151
+ Drop FreeBSD 4 support and assume we are at least at FreeBSD 6 with
152
+ memmem() supported.
153
+
154
+ Need to pick up a reroll?
155
+ source: <aEpZXqTOForaZzbf@humpty.home.comstyle.com>
156
+
157
+
158
+* jc/sed-build-fixes (2025-06-12) 1 commit
159
+ (merged to 'next' on 2025-06-12 at 4ad86fa8cf)
160
+ + build: sed portability fixes
161
+
162
+ Build fix.
163
+
164
+ Will merge to 'master'.
165
+ source: <xmqqplf8evr9.fsf@gitster.g>
166
+
167
+
168
+* jc/tag-idempotent-no-op (2025-06-10) 1 commit
169
+ - tag: allow idempotent "git tag" without "--force"
170
+
171
+ "git tag T O" when the tag T is already pointing at the object O is
172
+ a no-op; we used to but no longer error out such a request and
173
+ require "--force" and instead turn it into a no-op.
174
+
175
+ Comments?
176
+ source: <xmqqzfefodje.fsf@gitster.g>
177
+
178
+
179
+* ss/compat-bswap-revamp (2025-06-11) 6 commits
180
+ - bswap.h: provide a built-in based version of bswap32/64 if possible
181
+ - bswap.h: remove optimized x86 version of bswap32/64
182
+ - bswap.h: always overwrite ntohl/ntohll macros
183
+ - bswap.h: define GIT_LITTLE_ENDIAN on MSVC as little endian
184
+ - bswap.h: add support for __BYTE_ORDER__
185
+ - Merge branch 'ss/revert-builtin-bswap-stuff' into ss/compat-bswap-revamp
186
+ (this branch uses ss/revert-builtin-bswap-stuff.)
187
+
188
+ Clean-up compat/bswap.h mess.
189
+
190
+ Comments?
191
+ source: <20250611221444.1567638-1-sebastian@breakpoint.cc>
192
+
193
+
194
+* ss/revert-builtin-bswap-stuff (2025-06-11) 1 commit
195
+ (merged to 'next' on 2025-06-12 at fcaad0fe34)
196
+ + Revert "bswap.h: add support for built-in bswap functions"
197
+ (this branch is used by ss/compat-bswap-revamp.)
198
+
199
+ Revert a botched bswap.h change that broke ntohll() functions on
200
+ big-endian systems with __builtin_bswap32/64().
201
+
202
+ Will merge to 'master'.
203
+ source: <20250611221444.1567638-2-sebastian@breakpoint.cc>
204
+
205
+--------------------------------------------------
206
+[Cooking]
207
+
208
* ja/doc-git-log-markup (2025-06-08) 9 commits
209
- doc: git-log: convert log config to new doc format
210
- doc: git-log: convert diff options to new doc format
@@ -73,18 +217,20 @@ Release tarballs are available at:
217
- doc: convert git-log to new documentation format
218
219
Doc mark-up updates.
220
+
221
+ Review?
222
source: <pull.1933.git.1749373787.gitgitgadget@gmail.com>
223
224
79
-* kj/stash-onbranch-submodule-fix (2025-06-08) 1 commit
80
- (merged to 'next' on 2025-06-09 at a5dae097d7)
225
+* kj/stash-onbranch-submodule-fix (2025-06-10) 1 commit
226
+ (merged to 'next' on 2025-06-11 at dab89b8040)
227
+ stash: fix incorrect branch name in stash message
228
229
"git stash" recorded a wrong branch name when submodules are
230
present in the current checkout, which has been corrected.
231
232
Will cook in 'next'.
87
- source: <20250608144542.275836-1-jayatheerthkulkarni2005@gmail.com>
233
+ source: <20250611014204.24994-1-jayatheerthkulkarni2005@gmail.com>
234
235
236
* ly/submodule-update-failure-leakfix (2025-06-07) 1 commit
@@ -96,8 +242,6 @@ Release tarballs are available at:
242
Will cook in 'next'.
243
source: <pull.1987.git.git.1749355019495.gitgitgadget@gmail.com>
244
99
---------------------------------------------------
100
-[Cooking]
245
246
* kn/fetch-push-bulk-ref-update-fixup (2025-06-06) 3 commits
247
- receive-pack: handle reference deletions separately
@@ -121,14 +265,6 @@ Release tarballs are available at:
265
source: <20250606123138.566178-1-martin.agren@gmail.com>
266
267
124
-* ss/bswap-ntohll-fix (2025-06-06) 1 commit
125
- . bswap.h: Move the overwriting of the ntohl*/ htonl* macros.
126
-
127
- Seems to break Windows rather badly.
128
- cf. https://github.com/git/git/actions/runs/15511228119/job/43672455770#step:4:92
129
- source: <20250606165718.HOiC2U4X@breakpoint.cc>
130
-
131
-
268
* bs/solaris-10-and-11 (2025-06-07) 1 commit
269
(merged to 'next' on 2025-06-09 at a6d20b3666)
270
+ config.mak.uname: update settings for Solaris 10 and 11
@@ -154,7 +290,7 @@ Release tarballs are available at:
290
"git imap-send" has been broken for a long time, which has been
291
resurrected and then taught to talk OAuth2.0 etc.
292
157
- Ready?
293
+ Will merge to 'next'?
294
source: <PN3PR01MB95976572C3B14C983802ECC1B86BA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
295
296
@@ -392,6 +528,7 @@ Release tarballs are available at:
528
+ t9822: use prereq to check for ISO-8859-1 support
529
+ t: silence output from `test_create_repo()`
530
+ t: stop announcing prereqs
531
+ (this branch is used by rj/meson-tap-parse-fixup.)
532
533
Meson-based build/test framework now understands TAP output
534
generated by our tests.
@@ -464,7 +601,7 @@ Release tarballs are available at:
601
source: <20250608032705.11990-1-jayatheerthkulkarni2005@gmail.com>
602
603
467
-* bc/stash-export-import (2025-06-01) 4 commits
604
+* bc/stash-export-import (2025-06-11) 4 commits
605
- builtin/stash: provide a way to import stashes from a ref
606
- builtin/stash: provide a way to export stashes to a ref
607
- builtin/stash: factor out revision parsing into a function
@@ -473,9 +610,8 @@ Release tarballs are available at:
610
An interchange format for stash entries is defined, and subcommand
611
of "git stash" to import/export has been added.
612
476
- Expecting a (hopefully small and final) reroll.
477
- cf. <127d9d03-e94e-4928-9c6d-07a5396ca325@gmail.com>
478
- source: <20250601223225.464076-1-sandals@crustytoothpaste.net>
613
+ Will merge to 'next'?
614
+ source: <20250612011221.4158484-1-sandals@crustytoothpaste.net>
615
616
617
* lm/add-p-context (2025-05-10) 4 commits
@@ -537,7 +673,7 @@ Release tarballs are available at:
673
source: <20250605-pks-object-store-wo-the-repository-v5-0-779d1c28774b@pks.im>
674
675
540
-* cc/promisor-remote-capability (2025-05-19) 5 commits
676
+* cc/promisor-remote-capability (2025-06-11) 5 commits
677
- promisor-remote: use string constants for 'name' and 'url' too
678
- promisor-remote: allow a client to check fields
679
- promisor-remote: refactor how we parse advertised fields
@@ -548,9 +684,8 @@ Release tarballs are available at:
684
allow the "partialCloneFilter" settings and the "token" value to be
685
communicated from the server side.
686
551
- Expecting a reroll.
552
- cf. <aDVu6O9MUicmd8y4@pks.im>
553
- source: <20250519141259.3061550-1-christian.couder@gmail.com>
687
+ Comments?
688
+ source: <20250611134506.2975856-1-christian.couder@gmail.com>
689
690
691
* jc/you-still-use-whatchanged (2025-05-12) 6 commits
@@ -641,50 +776,9 @@ Release tarballs are available at:
776
--------------------------------------------------
777
[Discarded]
778
644
-* pw/update-thunderbird-patch-inline (2025-05-16) 1 commit
645
- . contrib: update thunderbird-patch-inline
646
-
647
- Update bitrotten instruction for sending patches via Thunderbird
648
- (in contrib/).
649
-
650
- Will discard, as it was let be bitrotten without bothering any users.
651
- source: <20250516135540.218937-1-phillip.wood123@gmail.com>
652
-
653
-
654
-* js/misc-defensive (2025-05-15) 14 commits
655
- . shallow: handle missing shallow commits gracefully
656
- . test-tool repository: check return value of `lookup_commit()`
657
- . submodule: check return value of `submodule_from_path()`
658
- . inherit_tracking(): defensive programming
659
- . describe: defensive programming
660
- . fetch: defensive programming
661
- . push: defensive programming
662
- . stash: defensive programming
663
- . stash: defensive programming
664
- . verify_commit_graph(): defensive programming
665
- . unparse_commit(): defensive programming
666
- . fetch-pack: defensive programming
667
- . get_parent(): defensive programming
668
- . revision: defensive programming
669
-
670
- Assorted changes that please CodeQL.
671
-
672
- Will discard, as no strong support seems to be there in the thread.
673
- source: <pull.1890.git.1747313139.gitgitgadget@gmail.com>
674
-
675
-
676
-* pb/status-rebase-fixes (2025-03-28) 4 commits
677
- . wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
678
- . wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase
679
- . SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>
680
- . rebase -r: do create merge commit after empty resolution
681
-
682
- A few fixes around "git status" while "git rebase" is running,
683
- plus a corner case bug fix for "git rebase -r".
684
-
685
- Retracted.
686
- cf. <642C61F8-FF74-4012-912F-51D364D1B2F6@gmail.com>
687
- Expecting a (hopefully small and final) reroll.
688
- cf. <c2f93d99-2f4d-ee6d-7087-42320c6df0f2@gmx.de>
689
- cf. <e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com>
690
- source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>
779
+* ss/bswap-ntohll-fix (2025-06-06) 1 commit
780
+ . bswap.h: Move the overwriting of the ntohl*/ htonl* macros.
781
+
782
+ Seems to break Windows rather badly.
783
+ cf. https://github.com/git/git/actions/runs/15511228119/job/43672455770#step:4:92
784
+ source: <20250606165718.HOiC2U4X@breakpoint.cc>