What's cooking (2023/11) #05
Junio C Hamano committed
Nov 13, 2023 at 12:52 UTC
2057d509978fa2caeb15ef14b61c12e7bfe3c1f1
1 file changed
+127
-177
whats-cooking.txt
+127
-177
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2023, #04; Thu, 9)
3
-X-master-at: dadef801b365989099a9929e995589e455c51fed
4
-X-next-at: bcd1edfa6a19000b3bc04690bd9c0d0c692dd5b3
2
+Subject: What's cooking in git.git (Nov 2023, #05; Mon, 13)
3
+X-master-at: e0939bec273052b1a8d69db4a3f7c87aaf83e220
4
+X-next-at: 309e3ec6dda82ab1e7b7722ef344e6c5d0c0964b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2023, #04; Thu, 9)
7
+What's cooking in git.git (Nov 2023, #05; Mon, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -52,142 +52,79 @@ Release tarballs are available at:
52
https://www.kernel.org/pub/software/scm/git/
53
54
--------------------------------------------------
55
-[Graduated to 'master']
55
+[New Topics]
56
+
57
+* jk/chunk-bounds-more (2023-11-09) 9 commits
58
+ (merged to 'next' on 2023-11-13 at 3df4b18bea)
59
+ + commit-graph: mark chunk error messages for translation
60
+ + commit-graph: drop verify_commit_graph_lite()
61
+ + commit-graph: check order while reading fanout chunk
62
+ + commit-graph: use fanout value for graph size
63
+ + commit-graph: abort as soon as we see a bogus chunk
64
+ + commit-graph: clarify missing-chunk error messages
65
+ + commit-graph: drop redundant call to "lite" verification
66
+ + midx: check consistency of fanout table
67
+ + commit-graph: handle overflow in chunk_size checks
68
+ (this branch is used by tb/pair-chunk-expect.)
69
57
-* an/clang-format-typofix (2023-11-01) 1 commit
58
- (merged to 'next' on 2023-11-02 at 7f639690ab)
59
- + clang-format: fix typo in comment
60
-
61
- Typofix.
62
- source: <pull.1602.v2.git.git.1698759629166.gitgitgadget@gmail.com>
63
-
64
-
65
-* bc/merge-file-object-input (2023-11-02) 2 commits
66
- (merged to 'next' on 2023-11-02 at ccbba9416c)
67
- + merge-file: add an option to process object IDs
68
- + git-merge-file doc: drop "-file" from argument placeholders
69
-
70
- "git merge-file" learns a mode to read three contents to be merged
71
- from blob objects.
72
- source: <20231101192419.794162-1-sandals@crustytoothpaste.net>
73
-
74
-
75
-* jc/test-i18ngrep (2023-11-02) 2 commits
76
- (merged to 'next' on 2023-11-03 at 78406f8d94)
77
- + tests: teach callers of test_i18ngrep to use test_grep
78
- + test framework: further deprecate test_i18ngrep
79
-
80
- Another step to deprecate test_i18ngrep.
81
- source: <20231031052330.3762989-1-gitster@pobox.com>
82
-
83
-
84
-* jk/chunk-bounds (2023-11-04) 1 commit
85
- (merged to 'next' on 2023-11-06 at ae9fbc1700)
86
- + t: avoid perl's pack/unpack "Q" specifier
87
-
88
- Test portability fix.
89
- source: <20231103162019.GB1470570@coredump.intra.peff.net>
90
-
91
-
92
-* jk/tree-name-and-depth-limit (2023-11-02) 1 commit
93
- (merged to 'next' on 2023-11-06 at 041423344c)
94
- + max_tree_depth: lower it for MSVC to avoid stack overflows
95
-
96
- Further limit tree depth max to avoid Windows build running out of
97
- the stack space.
98
- source: <pull.1604.v2.git.1698843810814.gitgitgadget@gmail.com>
99
-
100
-
101
-* js/ci-use-macos-13 (2023-11-03) 1 commit
102
- (merged to 'next' on 2023-11-06 at f7406347cd)
103
- + ci: upgrade to using macos-13
104
-
105
- Replace macos-12 used at GitHub CI with macos-13.
106
- source: <pull.1607.git.1698996455218.gitgitgadget@gmail.com>
70
+ Code clean-up for jk/chunk-bounds topic.
71
72
+ Will cook in 'next'.
73
+ source: <20231109070310.GA2697602@coredump.intra.peff.net>
74
109
-* kn/rev-list-missing-fix (2023-11-01) 4 commits
110
- (merged to 'next' on 2023-11-02 at 2469dfc402)
111
- + rev-list: add commit object support in `--missing` option
112
- + rev-list: move `show_commit()` to the bottom
113
- + revision: rename bit to `do_not_die_on_missing_objects`
114
- + Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' into kn/rev-list-missing-fix
115
- (this branch uses ps/do-not-trust-commit-graph-blindly-for-existence.)
75
117
- "git rev-list --missing" did not work for missing commit objects,
118
- which has been corrected.
119
- source: <20231026101109.43110-1-karthik.188@gmail.com>
76
+* ps/httpd-tests-on-nixos (2023-11-11) 3 commits
77
+ (merged to 'next' on 2023-11-13 at 81bd6f5334)
78
+ + t9164: fix inability to find basename(1) in Subversion hooks
79
+ + t/lib-httpd: stop using legacy crypt(3) for authentication
80
+ + t/lib-httpd: dynamically detect httpd and modules path
81
82
+ Portability tweak.
83
122
-* la/strvec-header-fix (2023-11-03) 1 commit
123
- (merged to 'next' on 2023-11-03 at db23d8a911)
124
- + strvec: drop unnecessary include of hex.h
125
-
126
- Code clean-up.
127
- source: <pull.1608.git.1698958277454.gitgitgadget@gmail.com>
84
+ Will merge to 'master'.
85
+ source: <cover.1699596457.git.ps@pks.im>
86
87
130
-* ps/do-not-trust-commit-graph-blindly-for-existence (2023-11-01) 2 commits
131
- (merged to 'next' on 2023-11-01 at 06037376ee)
132
- + commit: detect commits that exist in commit-graph but not in the ODB
133
- + commit-graph: introduce envvar to disable commit existence checks
134
- (this branch is used by kn/rev-list-missing-fix.)
88
+* ss/format-patch-use-encode-headers-for-cover-letter (2023-11-10) 1 commit
89
+ - format-patch: fix ignored encode_email_headers for cover letter
90
136
- The codepath to traverse the commit-graph learned to notice that a
137
- commit is missing (e.g., corrupt repository lost an object), even
138
- though it knows something about the commit (like its parents) from
139
- what is in commit-graph.
140
- source: <cover.1698736363.git.ps@pks.im>
91
+ "git format-patch --encode-email-headers" ignored the option when
92
+ preparing the cover letter, which has been corrected.
93
94
+ Will merge to 'next'.
95
+ source: <20231109111950.387219-1-contact@emersion.fr>
96
143
-* ps/leakfixes (2023-11-07) 4 commits
144
- (merged to 'next' on 2023-11-08 at 1969726a2f)
145
- + setup: fix leaking repository format
146
- + setup: refactor `upgrade_repository_format()` to have common exit
147
- + shallow: fix memory leak when registering shallow roots
148
- + test-bloom: stop setting up Git directory twice
97
150
- Leakfix.
151
- source: <cover.1699267422.git.ps@pks.im>
98
+* ps/ban-a-or-o-operator-with-test (2023-11-11) 4 commits
99
+ - Makefile: stop using `test -o` when unlinking duplicate executables
100
+ - contrib/subtree: convert subtree type check to use case statement
101
+ - contrib/subtree: stop using `-o` to test for number of args
102
+ - global: convert trivial usages of `test <expr> -a/-o <expr>`
103
104
+ Test and shell scripts clean-up.
105
154
-* ps/show-ref (2023-11-01) 12 commits
155
- (merged to 'next' on 2023-11-02 at 987bb117f5)
156
- + t: use git-show-ref(1) to check for ref existence
157
- + builtin/show-ref: add new mode to check for reference existence
158
- + builtin/show-ref: explicitly spell out different modes in synopsis
159
- + builtin/show-ref: ensure mutual exclusiveness of subcommands
160
- + builtin/show-ref: refactor options for patterns subcommand
161
- + builtin/show-ref: stop using global vars for `show_one()`
162
- + builtin/show-ref: stop using global variable to count matches
163
- + builtin/show-ref: refactor `--exclude-existing` options
164
- + builtin/show-ref: fix dead code when passing patterns
165
- + builtin/show-ref: fix leaking string buffer
166
- + builtin/show-ref: split up different subcommands
167
- + builtin/show-ref: convert pattern to a local variable
168
- (this branch is used by ps/ref-tests-update.)
106
+ Will merge to 'next'.
107
+ source: <cover.1699609940.git.ps@pks.im>
108
170
- Teach "git show-ref" a mode to check the existence of a ref.
171
- source: <cover.1698739941.git.ps@pks.im>
109
110
+* vd/glossary-dereference-peel (2023-11-10) 1 commit
111
+ - glossary: add definitions for dereference & peel
112
174
-* tb/format-pack-doc-update (2023-11-01) 2 commits
175
- (merged to 'next' on 2023-11-02 at 538991fe9b)
176
- + Documentation/gitformat-pack.txt: fix incorrect MIDX documentation
177
- + Documentation/gitformat-pack.txt: fix typo
113
+ "To dereference" and "to peel" were sometimes used in in-code
114
+ comments and documentation but without description in the glossary.
115
179
- Doc update.
180
- source: <cover.1698780244.git.me@ttaylorr.com>
116
+ Expecting an update.
117
+ cf. <xmqq1qcyxxri.fsf@gitster.g>
118
+ source: <pull.1610.git.1699574277143.gitgitgadget@gmail.com>
119
120
183
-* tb/rev-list-unpacked-fix (2023-11-07) 2 commits
184
- (merged to 'next' on 2023-11-08 at 4b73bc0256)
185
- + pack-bitmap: drop --unpacked non-commit objects from results
186
- + list-objects: drop --unpacked non-commit objects from results
121
+* ak/rebase-autosquash (2023-11-13) 4 commits
122
+ - rebase: rewrite --(no-)autosquash documentation
123
+ - rebase: test autosquash with and without -i
124
+ - rebase: support --autosquash without -i
125
+ - rebase: fully ignore rebase.autoSquash without -i
126
188
- "git rev-list --unpacked --objects" failed to exclude packed
189
- non-commit objects, which has been corrected.
190
- source: <cover.1699311386.git.me@ttaylorr.com>
127
+ source: <20231111132720.78877-1-andy.koppe@gmail.com>
128
129
--------------------------------------------------
130
[Stalled]
@@ -256,56 +193,49 @@ Release tarballs are available at:
193
194
195
* jw/git-add-attr-pathspec (2023-11-04) 1 commit
259
- - attr: enable attr pathspec magic for git-add and git-stash
196
+ (merged to 'next' on 2023-11-13 at b61be94e4d)
197
+ + attr: enable attr pathspec magic for git-add and git-stash
198
199
"git add" and "git stash" learned to support the ":(attr:...)"
200
magic pathspec.
201
264
- Will merge to 'next'?
202
+ Will cook in 'next'.
203
source: <20231103163449.1578841-1-jojwang@google.com>
204
205
268
-* jc/strbuf-comment-line-char (2023-11-01) 4 commits
269
- - strbuf: move env-using functions to environment.c
270
- - strbuf: make add_lines() public
271
- - strbuf_add_commented_lines(): drop the comment_line_char parameter
272
- - strbuf_commented_addf(): drop the comment_line_char parameter
273
-
274
- Code simplification.
275
- source: <cover.1698791220.git.jonathantanmy@google.com>
276
-
277
-
278
-* ps/ci-gitlab (2023-11-02) 8 commits
279
- - ci: add support for GitLab CI
280
- - ci: install test dependencies for linux-musl
281
- - ci: squelch warnings when testing with unusable Git repo
282
- - ci: unify setup of some environment variables
283
- - ci: split out logic to set up failed test artifacts
284
- - ci: group installation of Docker dependencies
285
- - ci: make grouping setup more generic
286
- - ci: reorder definitions for grouping functions
206
+* ps/ci-gitlab (2023-11-09) 8 commits
207
+ (merged to 'next' on 2023-11-10 at ea7ed67945)
208
+ + ci: add support for GitLab CI
209
+ + ci: install test dependencies for linux-musl
210
+ + ci: squelch warnings when testing with unusable Git repo
211
+ + ci: unify setup of some environment variables
212
+ + ci: split out logic to set up failed test artifacts
213
+ + ci: group installation of Docker dependencies
214
+ + ci: make grouping setup more generic
215
+ + ci: reorder definitions for grouping functions
216
217
Add support for GitLab CI.
218
290
- Comments?
291
- source: <cover.1698843660.git.ps@pks.im>
219
+ Will cook in 'next'.
220
+ source: <cover.1699514143.git.ps@pks.im>
221
222
223
* ps/ref-tests-update (2023-11-03) 10 commits
295
- - t: mark several tests that assume the files backend with REFFILES
296
- - t7900: assert the absence of refs via git-for-each-ref(1)
297
- - t7300: assert exact states of repo
298
- - t4207: delete replace references via git-update-ref(1)
299
- - t1450: convert tests to remove worktrees via git-worktree(1)
300
- - t: convert tests to not access reflog via the filesystem
301
- - t: convert tests to not access symrefs via the filesystem
302
- - t: convert tests to not write references via the filesystem
303
- - t: allow skipping expected object ID in `ref-store update-ref`
304
- - Merge branch 'ps/show-ref' into ps/ref-tests-update
224
+ (merged to 'next' on 2023-11-13 at dc26e55d6f)
225
+ + t: mark several tests that assume the files backend with REFFILES
226
+ + t7900: assert the absence of refs via git-for-each-ref(1)
227
+ + t7300: assert exact states of repo
228
+ + t4207: delete replace references via git-update-ref(1)
229
+ + t1450: convert tests to remove worktrees via git-worktree(1)
230
+ + t: convert tests to not access reflog via the filesystem
231
+ + t: convert tests to not access symrefs via the filesystem
232
+ + t: convert tests to not write references via the filesystem
233
+ + t: allow skipping expected object ID in `ref-store update-ref`
234
+ + Merge branch 'ps/show-ref' into ps/ref-tests-update
235
236
Update ref-related tests.
237
308
- Comments?
238
+ Will cook in 'next'.
239
source: <cover.1698914571.git.ps@pks.im>
240
241
@@ -316,7 +246,8 @@ Release tarballs are available at:
246
"git fetch --atomic" issued an unnecessary empty error message,
247
which has been corrected.
248
319
- Needs review.
249
+ Expecting an update.
250
+ cf. <ZTjQIrCgSANAT8wR@tanuki>
251
source: <ced46baeb1c18b416b4b4cc947f498bea2910b1b.1697725898.git.zhiyou.jx@alibaba-inc.com>
252
253
@@ -360,25 +291,26 @@ Release tarballs are available at:
291
"git merge-tree" learned "--write-pack" to record its result
292
without creating loose objects.
293
363
- Comments?
294
+ Broken when an object created during a merge is needed to continue merge
295
+ cf. <CABPp-BEfy9VOvimP9==ry_rZXu=metOQ8s=_-XiG_Pdx9c06Ww@mail.gmail.com>
296
source: <cover.1698101088.git.me@ttaylorr.com>
297
298
367
-* tb/pair-chunk-expect-size (2023-10-14) 8 commits
299
+* tb/pair-chunk-expect (2023-11-10) 8 commits
300
- midx: read `OOFF` chunk with `pair_chunk_expect()`
301
- midx: read `OIDL` chunk with `pair_chunk_expect()`
370
- - midx: read `OIDF` chunk with `pair_chunk_expect()`
302
- commit-graph: read `BIDX` chunk with `pair_chunk_expect()`
303
- commit-graph: read `GDAT` chunk with `pair_chunk_expect()`
304
- commit-graph: read `CDAT` chunk with `pair_chunk_expect()`
374
- - commit-graph: read `OIDF` chunk with `pair_chunk_expect()`
305
+ - commit-graph: read `OIDL` chunk with `pair_chunk_expect()`
306
- chunk-format: introduce `pair_chunk_expect()` helper
307
+ - Merge branch 'jk/chunk-bounds-more' into HEAD
308
+ (this branch uses jk/chunk-bounds-more.)
309
377
- Code clean-up for jk/chunk-bounds topic.
310
+ Further code clean-up.
311
379
- Comments?
380
- source: <45cac29403e63483951f7766c6da3c022c68d9f0.1697225110.git.me@ttaylorr.com>
381
- source: <cover.1697225110.git.me@ttaylorr.com>
312
+ Needs review.
313
+ source: <cover.1699569246.git.me@ttaylorr.com>
314
315
316
* tb/path-filter-fix (2023-10-18) 17 commits
@@ -557,31 +489,33 @@ Release tarballs are available at:
489
source: <xmqqcyykig1l.fsf@gitster.g>
490
491
560
-* js/doc-unit-tests (2023-11-02) 3 commits
561
- - ci: run unit tests in CI
562
- - unit tests: add TAP unit test framework
563
- - unit tests: add a project plan document
492
+* js/doc-unit-tests (2023-11-10) 3 commits
493
+ (merged to 'next' on 2023-11-10 at 7d00ffd06b)
494
+ + ci: run unit tests in CI
495
+ + unit tests: add TAP unit test framework
496
+ + unit tests: add a project plan document
497
(this branch is used by js/doc-unit-tests-with-cmake.)
498
499
Process to add some form of low-level unit tests has started.
500
568
- Will merge to 'next'?
569
- source: <cover.1698881249.git.steadmon@google.com>
501
+ Will cook in 'next'.
502
+ source: <cover.1699555664.git.steadmon@google.com>
503
504
572
-* js/doc-unit-tests-with-cmake (2023-11-02) 7 commits
573
- - cmake: handle also unit tests
574
- - cmake: use test names instead of full paths
575
- - cmake: fix typo in variable name
576
- - artifacts-tar: when including `.dll` files, don't forget the unit-tests
577
- - unit-tests: do show relative file paths
578
- - unit-tests: do not mistake `.pdb` files for being executable
579
- - cmake: also build unit tests
505
+* js/doc-unit-tests-with-cmake (2023-11-10) 7 commits
506
+ (merged to 'next' on 2023-11-10 at b4503c9c8c)
507
+ + cmake: handle also unit tests
508
+ + cmake: use test names instead of full paths
509
+ + cmake: fix typo in variable name
510
+ + artifacts-tar: when including `.dll` files, don't forget the unit-tests
511
+ + unit-tests: do show relative file paths
512
+ + unit-tests: do not mistake `.pdb` files for being executable
513
+ + cmake: also build unit tests
514
(this branch uses js/doc-unit-tests.)
515
516
Update the base topic to work with CMake builds.
517
584
- Will merge to 'next'?
518
+ Will cook in 'next'.
519
source: <pull.1579.v3.git.1695640836.gitgitgadget@gmail.com>
520
521
@@ -605,3 +539,19 @@ Release tarballs are available at:
539
540
Needs review.
541
source: <2e24ca9b-9c5f-f4df-b9f8-6574a714dfb2@gmail.com>
542
+
543
+--------------------------------------------------
544
+[Discarded]
545
+
546
+* jc/strbuf-comment-line-char (2023-11-01) 4 commits
547
+ . strbuf: move env-using functions to environment.c
548
+ . strbuf: make add_lines() public
549
+ . strbuf_add_commented_lines(): drop the comment_line_char parameter
550
+ . strbuf_commented_addf(): drop the comment_line_char parameter
551
+
552
+ Code simplification that goes directly against a past libification
553
+ topic. It is hard to judge because the "libification" is done
554
+ piecewise without seemingly clear design principle.
555
+
556
+ Will discard.
557
+ source: <cover.1698791220.git.jonathantanmy@google.com>