What's cooking (2024/05 #03)
Junio C Hamano committed
May 6, 2024 at 15:14 UTC
dc82500d36351fd9b3ccef1cb8c0016fe80ae085
1 file changed
+112
-58
whats-cooking.txt
+112
-58
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2024, #02; Fri, 3)
2
+Subject: What's cooking in git.git (May 2024, #03; Mon, 6)
3
X-master-at: d4cc1ec35f3bcce816b69986ca41943f6ce21377
4
-X-next-at: 7fe29c98d7a84cdef7e95a658d5ebfcb2a8b606b
4
+X-next-at: b98150cc7190226eafa47b017c34392aadf638ea
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2024, #02; Fri, 3)
7
+What's cooking in git.git (May 2024, #03; Mon, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,9 +17,6 @@ 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
-The first batch of topics for the new cycle have graduated to the
21
-'master' branch, and the tip of 'next' has been rewound.
22
-
20
Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
22
repositories have only a subset of branches.
@@ -51,14 +48,86 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[New Topics]
50
51
+* it/refs-name-conflict (2024-05-06) 1 commit
52
+ - refs: return conflict error when checking packed refs
53
+
54
+ Comments?
55
+ cf. <CAOLa=ZSre3f+0SR-_migfkPONqhinobKjU=NnGOJ_sTNM_L5ug@mail.gmail.com>
56
+ source: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com>
57
+
58
+
59
+* jc/format-patch-more-aggressive-range-diff (2024-05-06) 1 commit
60
+ - format-patch: run range-diff with larger creation-factor
61
+
62
+ The default "creation-factor" used by "git format-patch" has been
63
+ raised to make it more aggressively find matching commits.
64
+
65
+ Comments?
66
+ source: <xmqqbk5i3ncw.fsf_-_@gitster.g>
67
+
68
+
69
+* jp/tag-trailer (2024-05-06) 3 commits
70
+ - builtin/tag: add --trailer option
71
+ - builtin/commit: refactor --trailer logic
72
+ - builtin/commit: use ARGV macro to collect trailers
73
+
74
+ "git tag" learned the "--trailer" option to futz with the trailers
75
+ in the same way as "git commit" does.
76
+
77
+ Will merge to 'next'.
78
+ source: <pull.1723.v5.git.1714934950.gitgitgadget@gmail.com>
79
+
80
+
81
+* ow/refspec-glossary-update (2024-05-06) 1 commit
82
+ - Documentation: Mention that refspecs are explained elsewhere
83
+
84
+ Doc update.
85
+
86
+ Will merge to 'next'.
87
+ source: <20240506182317.13477-1-oystwa@gmail.com>
88
+
89
+
90
+* ps/ci-enable-minimal-fuzzers-at-gitlab (2024-05-06) 1 commit
91
+ - gitlab-ci: add smoke test for fuzzers
92
+
93
+ CI update.
94
+
95
+ Will merge to 'next'.
96
+ source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.git.ps@pks.im>
97
+
98
+
99
+* ps/ci-python-2-deprecation (2024-05-06) 1 commit
100
+ - ci: fix Python dependency on Ubuntu 24.04
101
+
102
+ Unbreak CI jobs so that we do not attempt to use Python 2 that has
103
+ been removed from the platform.
104
+
105
+ Will merge to 'next'.
106
+ source: <cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im>
107
+
108
+
109
+* rs/external-diff-with-exit-code (2024-05-06) 2 commits
110
+ - diff: fix --exit-code with external diff
111
+ - diff: report unmerged paths as changes in run_diff_cmd()
112
+
113
+ The "--exit-code" option of "git diff" command learned to work with
114
+ the "--ext-diff" option.
115
+
116
+ Will merge to 'next'?
117
+ source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de>
118
+
119
+--------------------------------------------------
120
+[Cooking]
121
+
122
* jc/test-workaround-broken-mv (2024-05-02) 1 commit
55
- - t/lib-chunk: work around broken "mv" on some vintage of macOS
123
+ (merged to 'next' on 2024-05-06 at 7e009c6827)
124
+ + t/lib-chunk: work around broken "mv" on some vintage of macOS
125
126
Tests that try to corrupt in-repository files in chunked format did
127
not work well on macOS due to its broken "mv", which has been
128
worked around.
129
61
- Will merge to 'next'.
130
+ Will merge to 'master'.
131
source: <xmqqsez0c6ma.fsf@gitster.g>
132
133
@@ -89,14 +158,15 @@ Release tarballs are available at:
158
159
160
* jl/git-no-advice (2024-05-03) 3 commits
92
- - advice: add --no-advice global option
93
- - doc: add spacing around paginate options
94
- - doc: clean up usage documentation for --no-* opts
161
+ (merged to 'next' on 2024-05-06 at 95cc03ef96)
162
+ + advice: add --no-advice global option
163
+ + doc: add spacing around paginate options
164
+ + doc: clean up usage documentation for --no-* opts
165
166
A new global "--no-advice" option can be used to disable all advice
167
messages, which is meant to be used only in scripts.
168
99
- Will merge to 'next'.
169
+ Will merge to 'master'.
170
source: <20240503071706.78109-1-james@jamesliu.io>
171
172
@@ -117,15 +187,16 @@ Release tarballs are available at:
187
188
189
* ma/win32-unix-domain-socket (2024-05-03) 1 commit
120
- - win32: fix building with NO_UNIX_SOCKETS
190
+ (merged to 'next' on 2024-05-06 at 799a546c96)
191
+ + win32: fix building with NO_UNIX_SOCKETS
192
193
Build fix.
194
124
- Will merge to 'next'.
195
+ Will merge to 'master'.
196
source: <20240503091427.2808390-1-mh@glandium.org>
197
198
128
-* ps/config-subcommands (2024-05-03) 14 commits
199
+* ps/config-subcommands (2024-05-06) 14 commits
200
- builtin/config: display subcommand help
201
- builtin/config: introduce "edit" subcommand
202
- builtin/config: introduce "remove-section" subcommand
@@ -145,8 +216,8 @@ Release tarballs are available at:
216
uses have been deprecated and replaced with subcommands (like "git
217
config get").
218
148
- Will merge to 'next'?
149
- source: <cover.1714730169.git.ps@pks.im>
219
+ Will merge to 'next'.
220
+ source: <cover.1714982328.git.ps@pks.im>
221
222
223
* ps/refs-without-the-repository (2024-05-03) 5 commits
@@ -185,33 +256,14 @@ Release tarballs are available at:
256
257
258
* tb/attr-limits (2024-05-03) 1 commit
188
- - attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()
259
+ (merged to 'next' on 2024-05-06 at b98150cc71)
260
+ + attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()
261
262
The maximum size of attribute files is enforced more consistently.
263
192
- Will merge to 'next'.
264
+ Will merge to 'master'.
265
source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com>
266
195
---------------------------------------------------
196
-[Graduated to 'master']
197
-
198
-* kn/update-ref-symrefs (2024-04-26) 7 commits
199
- - ref: support symrefs in 'reference-transaction' hook
200
- - update-ref: add support for 'symref-update' command
201
- - update-ref: add support for 'symref-create' command
202
- - update-ref: add support for 'symref-delete' command
203
- - update-ref: add support for 'symref-verify' command
204
- - files-backend: extract out `create_symref_lock`
205
- - refs: accept symref values in `ref_transaction[_add]_update`
206
-
207
- "update-ref" learns to also handle symbolic refs.
208
-
209
- Expecting a reroll.
210
- cf. <CAOLa=ZT4yVEuZXmiTVB2tf0qaTPCPn=0TcJRc89knZQWZBbFTg@mail.gmail.com>
211
- source: <20240426152449.228860-1-knayak@gitlab.com>
212
-
213
---------------------------------------------------
214
-[Cooking]
267
268
* bb/rgb-12-bit-colors (2024-05-02) 3 commits
269
(merged to 'next' on 2024-05-02 at 7fe29c98d7)
@@ -226,13 +278,14 @@ Release tarballs are available at:
278
source: <20240502110331.6347-1-dev+git@drbeat.li>
279
280
229
-* ds/scalar-reconfigure-all-fix (2024-04-30) 1 commit
281
+* ds/scalar-reconfigure-all-fix (2024-05-06) 1 commit
282
- scalar: avoid segfault in reconfigure --all
283
284
Scalar fix.
285
234
- Comments?
235
- source: <pull.1724.git.1714496333004.gitgitgadget@gmail.com>
286
+ Expecting a final (and hopefully small) reroll.
287
+ cf. <Zjhufiq2DmBlVpIx@tanuki>
288
+ source: <pull.1724.v2.git.1714874298859.gitgitgadget@gmail.com>
289
290
291
* ps/pseudo-ref-terminology (2024-05-02) 10 commits
@@ -575,20 +628,8 @@ Release tarballs are available at:
628
source: <cover.1696021277.git.jonathantanmy@google.com>
629
630
578
-* js/cmake-with-test-tool (2024-04-30) 2 commits
631
+* js/unit-test-suite-runner (2024-05-06) 9 commits
632
- cmake: let `test-tool` run the unit tests, too
580
- - Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool
581
- (this branch uses js/unit-test-suite-runner.)
582
-
583
- "test-tool" is now built in CMake build to also run the unit tests.
584
-
585
- May want to roll it into the base topic.
586
-
587
- Will merge to 'next' together with the base topic.
588
- source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
589
-
590
-
591
-* js/unit-test-suite-runner (2024-04-30) 8 commits
633
- ci: use test-tool as unit test runner on Windows
634
- t/Makefile: run unit tests alongside shell tests
635
- unit tests: add rule for running with test-tool
@@ -597,13 +638,13 @@ Release tarballs are available at:
638
- test-tool run-command testsuite: get shell from env
639
- t0080: turn t-basic unit test into a helper
640
- Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner
600
- (this branch is used by js/cmake-with-test-tool.)
641
642
The "test-tool" has been taught to run testsuite tests in parallel,
643
bypassing the need to use the "prove" tool.
644
605
- Will merge to 'next' together with js/cmake-with-test-tool?
606
- source: <cover.1714506612.git.steadmon@google.com>
645
+ Will merge to 'next'.
646
+ source: <cover.1715024899.git.steadmon@google.com>
647
+ source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
648
649
650
* bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit
@@ -668,3 +709,16 @@ Release tarballs are available at:
709
710
Not ready to be reviewed yet.
711
source: <20230824205456.1231371-1-gitster@pobox.com>
712
+
713
+--------------------------------------------------
714
+[Discarded]
715
+
716
+* js/cmake-with-test-tool (2024-04-30) 2 commits
717
+ . cmake: let `test-tool` run the unit tests, too
718
+ . Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool
719
+ (this branch uses js/unit-test-suite-runner.)
720
+
721
+ "test-tool" is now built in CMake build to also run the unit tests.
722
+
723
+ Rolled into the base topic.
724
+ source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>