What's cooking (2023/11 #09)

Junio C Hamano committed Nov 27, 2023 at 21:40 UTC 16da7cb02faaf8b4166b55f9fba3b7c4f7f5fbd1
1 file changed +135 -48
whats-cooking.txt
+135 -48
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Nov 2023, #08; Mon, 20)
2 +Subject: What's cooking in git.git (Nov 2023, #09; Mon, 27)
3 X-master-at: 564d0252ca632e0264ed670534a51d18a689ef5d
4 X-next-at: 3155946c3afb0941e6e01302cf86e4489bffc968
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Nov 2023, #08; Mon, 20)
7 +What's cooking in git.git (Nov 2023, #09; Mon, 27)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -17,10 +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 -Git 2.43 has been tagged. With many folks are away from the
21 -keyboard for vacation, I would expect it will be a very slow week.
22 -I'll be taking a few weeks off, too, so please enjoy this release ;-).
23 -
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.
@@ -50,43 +46,113 @@ Release tarballs are available at:
46 https://www.kernel.org/pub/software/scm/git/
47
48 --------------------------------------------------
53 -[Graduated to 'master']
49 +[New Topics]
50
55 -* tz/send-email-helpfix (2023-11-16) 1 commit
56 - (merged to 'next' on 2023-11-17 at 8422271795)
57 - + send-email: remove stray characters from usage
51 +* ad/merge-file-diff-algo (2023-11-22) 1 commit
52 + - merge-file: add --diff-algorithm option
53
59 - Typoes in "git send-email -h" have been corrected.
60 - source: <20231115173952.339303-3-tmz@pobox.com>
54 + "git merge-file" learned to take the "--diff-algorithm" option to
55 + use algorithm different from the default "myers" diff.
56
57 + Will merge to 'next'?
58 + source: <pull.1606.v2.git.git.1700507932937.gitgitgadget@gmail.com>
59
63 -* vd/glossary-dereference-peel (2023-11-14) 1 commit
64 - (merged to 'next' on 2023-11-17 at bac3ab0c0b)
65 - + glossary: add definitions for dereference & peel
60
67 - "To dereference" and "to peel" were sometimes used in in-code
68 - comments and documentation but without description in the glossary.
69 - source: <pull.1610.v2.git.1699917471769.gitgitgadget@gmail.com>
61 +* ak/p4-initial-empty-commits (2023-11-23) 1 commit
62 + - git-p4: fix fast import when empty commit is first
63
71 ---------------------------------------------------
72 -[New Topics]
64 + Expecting a reroll.
65 + source: <pull.1609.git.git.1700639764041.gitgitgadget@gmail.com>
66
74 -* ac/fuzz-show-date (2023-11-20) 1 commit
75 - - fuzz: add new oss-fuzz fuzzer for date.c / date.h
67
77 - Subject approxidate() and show_date() macchinery to OSS-Fuzz.
68 +* jc/checkout-B-branch-in-use (2023-11-23) 2 commits
69 + - checkout: forbid "-B <branch>" from touching a branch used elsewhere
70 + - checkout: refactor die_if_checked_out() caller
71
79 - Will merge to 'next'?
80 - source: <pull.1612.v4.git.1700243267653.gitgitgadget@gmail.com>
72 + "git checkout -B <branch> [<start-point>]" allowed a branch that is
73 + in use in another worktree to be updated and checked out, which
74 + might be a bit unexpected. The rule has been tightened, which is a
75 + breaking change. "--ignore-other-worktrees" option is required to
76 + unbreak you, if you are used to the current behaviour that "-B"
77 + overrides the safety.
78
79 + Needs review and documentation updates.
80 + source: <xmqqjzq9cl70.fsf@gitster.g>
81
83 -* js/packfile-h-typofix (2023-11-20) 1 commit
84 - - packfile.c: fix a typo in `each_file_in_pack_dir_fn()`'s declaration
82
86 - Typofix.
83 +* jh/trace2-redact-auth (2023-11-23) 4 commits
84 + - t0212: test URL redacting in EVENT format
85 + - t0211: test URL redacting in PERF format
86 + - trace2: redact passwords from https:// URLs by default
87 + - trace2: fix signature of trace2_def_param() macro
88 +
89 + trace2 streams used to record the URLs that potentially embed
90 + authentication material, which has been corrected.
91
92 Will merge to 'next'.
89 - source: <pull.1614.git.1700226915859.gitgitgadget@gmail.com>
93 + source: <pull.1616.git.1700680717.gitgitgadget@gmail.com>
94 +
95 +
96 +* ps/commit-graph-less-paranoid (2023-11-26) 1 commit
97 + - commit-graph: disable GIT_COMMIT_GRAPH_PARANOIA by default
98 +
99 + Earlier we stopped relying on commit-graph that (still) records
100 + information about commits that are lost from the object store,
101 + which has negative performance implications. The default has been
102 + flipped to disable this pessimization.
103 +
104 + Will merge to 'next'.
105 + source: <17e08289cd59d20de0de9b4e18f5e6bf77987351.1700823746.git.ps@pks.im>
106 +
107 +
108 +* ps/reftable-fixes (2023-11-22) 8 commits
109 + - reftable/stack: fix stale lock when dying
110 + - reftable/merged: reuse buffer to compute record keys
111 + - reftable/stack: reuse buffers when reloading stack
112 + - reftable/stack: perform auto-compaction with transactional interface
113 + - reftable/stack: verify that `reftable_stack_add()` uses auto-compaction
114 + - reftable: handle interrupted writes
115 + - reftable: handle interrupted reads
116 + - reftable: wrap EXPECT macros in do/while
117 +
118 + Bunch of small fix-ups to the reftable code.
119 +
120 + Needs review.
121 + source: <cover.1700549493.git.ps@pks.im>
122 +
123 +
124 +* en/complete-sparse-checkout (2023-11-27) 4 commits
125 + - completion: avoid user confusion in non-cone mode
126 + - completion: avoid misleading completions in cone mode
127 + - completion: fix logic for determining whether cone mode is active
128 + - completion: squelch stray errors in sparse-checkout completion
129 +
130 + source: <pull.1349.v2.git.1700985086.gitgitgadget@gmail.com>
131 +
132 +
133 +* jb/reflog-expire-delete-dry-run-options (2023-11-26) 1 commit
134 + - builtin/reflog.c: fix dry-run option short name
135 +
136 + source: <20231126000514.85509-1-josh@brob.st>
137 +
138 +
139 +* jc/orphan-unborn (2023-11-24) 2 commits
140 + - orphan/unborn: fix use of 'orphan' in end-user facing messages
141 + - orphan/unborn: add to the glossary and use them consistently
142 +
143 + source: <xmqq4jhb977x.fsf@gitster.g>
144 +
145 +
146 +* rs/column-leakfix (2023-11-27) 1 commit
147 + - column: release strbuf and string_list after use
148 +
149 + source: <f087137d-a5aa-487e-a1cb-0ad7117b38ed@web.de>
150 +
151 +
152 +* rs/i18n-cannot-be-used-together (2023-11-27) 1 commit
153 + - i18n: factorize even more 'incompatible options' messages
154 +
155 + source: <e6eb12e4-bb63-473c-9c2f-965a4d5981ad@web.de>
156
157 --------------------------------------------------
158 [Stalled]
@@ -133,6 +199,24 @@ Release tarballs are available at:
199 --------------------------------------------------
200 [Cooking]
201
202 +* ac/fuzz-show-date (2023-11-20) 1 commit
203 + - fuzz: add new oss-fuzz fuzzer for date.c / date.h
204 +
205 + Subject approxidate() and show_date() macchinery to OSS-Fuzz.
206 +
207 + Will merge to 'next'?
208 + source: <pull.1612.v4.git.1700243267653.gitgitgadget@gmail.com>
209 +
210 +
211 +* js/packfile-h-typofix (2023-11-20) 1 commit
212 + - packfile.c: fix a typo in `each_file_in_pack_dir_fn()`'s declaration
213 +
214 + Typofix.
215 +
216 + Will merge to 'next'.
217 + source: <pull.1614.git.1700226915859.gitgitgadget@gmail.com>
218 +
219 +
220 * jw/builtin-objectmode-attr (2023-11-16) 2 commits
221 - SQUASH???
222 - attr: add builtin objectmode values support
@@ -167,7 +251,7 @@ Release tarballs are available at:
251 requirement for Perl to 5.8.1 (from September 2002) to allow
252 simplifying our implementation.
253
170 - Will cook in 'next'.
254 + Will merge to 'master'.
255 source: <20231116193014.470420-1-tmz@pobox.com>
256
257
@@ -179,7 +263,7 @@ Release tarballs are available at:
263 The way CI testing used "prove" could lead to running the test
264 suite twice needlessly, which has been corrected.
265
182 - Will cook in 'next'.
266 + Will merge to 'master'.
267 source: <pull.1613.git.1699894837844.gitgitgadget@gmail.com>
268
269
@@ -198,7 +282,7 @@ Release tarballs are available at:
282
283 Code clean-up for jk/chunk-bounds topic.
284
201 - Will cook in 'next'.
285 + Will merge to 'master'.
286 source: <20231109070310.GA2697602@coredump.intra.peff.net>
287
288
@@ -210,7 +294,7 @@ Release tarballs are available at:
294
295 Portability tweak.
296
213 - Will cook in 'next'.
297 + Will merge to 'master'.
298 source: <cover.1699596457.git.ps@pks.im>
299
300
@@ -221,7 +305,7 @@ Release tarballs are available at:
305 "git format-patch --encode-email-headers" ignored the option when
306 preparing the cover letter, which has been corrected.
307
224 - Will cook in 'next'.
308 + Will merge to 'master'.
309 source: <20231109111950.387219-1-contact@emersion.fr>
310
311
@@ -234,7 +318,7 @@ Release tarballs are available at:
318
319 Test and shell scripts clean-up.
320
237 - Will cook in 'next'.
321 + Will merge to 'master'.
322 source: <cover.1699609940.git.ps@pks.im>
323
324
@@ -247,7 +331,7 @@ Release tarballs are available at:
331 "git rebase --autosquash" is now enabled for non-interactive rebase,
332 but it is still incompatible with the apply backend.
333
250 - Will cook in 'next'.
334 + Will merge to 'master'.
335 source: <20231114214339.10925-1-andy.koppe@gmail.com>
336
337
@@ -269,7 +353,7 @@ Release tarballs are available at:
353 in an unspecified order, to allow certain optimizations to take
354 advantage of.
355
272 - Will cook in 'next'.
356 + Will merge to 'master'.
357 source: <pull.1609.v2.git.1699991638.gitgitgadget@gmail.com>
358
359
@@ -280,7 +364,7 @@ Release tarballs are available at:
364 "git add" and "git stash" learned to support the ":(attr:...)"
365 magic pathspec.
366
283 - Will cook in 'next'.
367 + Will merge to 'master'.
368 source: <20231103163449.1578841-1-jojwang@google.com>
369
370
@@ -298,7 +382,7 @@ Release tarballs are available at:
382
383 Add support for GitLab CI.
384
301 - Will cook in 'next'.
385 + Will merge to 'master'.
386 source: <cover.1699514143.git.ps@pks.im>
387
388
@@ -317,7 +401,7 @@ Release tarballs are available at:
401
402 Update ref-related tests.
403
320 - Will cook in 'next'.
404 + Will merge to 'master'.
405 source: <cover.1698914571.git.ps@pks.im>
406
407
@@ -422,7 +506,7 @@ Release tarballs are available at:
506 source: <cover.1697653929.git.me@ttaylorr.com>
507
508
425 -* cc/git-replay (2023-11-16) 14 commits
509 +* cc/git-replay (2023-11-26) 14 commits
510 - replay: stop assuming replayed branches do not diverge
511 - replay: add --contained to rebase contained branches
512 - replay: add --advance or 'cherry-pick' mode
@@ -440,7 +524,10 @@ Release tarballs are available at:
524
525 Introduce "git replay", a tool meant on the server side without
526 working tree to recreate a history.
443 - source: <20231115143327.2441397-1-christian.couder@gmail.com>
527 +
528 + Will merge to 'next'.
529 + cf. <6bfe1541-54dd-ca6b-e930-94d3038060f1@gmx.de>
530 + source: <20231124111044.3426007-1-christian.couder@gmail.com>
531
532
533 * ak/color-decorate-symbols (2023-10-23) 7 commits
@@ -458,17 +545,17 @@ Release tarballs are available at:
545 source: <20231023221143.72489-1-andy.koppe@gmail.com>
546
547
461 -* js/update-urls-in-doc-and-comment (2023-09-26) 4 commits
548 +* js/update-urls-in-doc-and-comment (2023-11-26) 4 commits
549 - doc: refer to internet archive
550 - doc: update links for andre-simon.de
464 - - doc: update links to current pages
551 - doc: switch links to https
552 + - doc: update links to current pages
553
554 Stale URLs have been updated to their current counterparts (or
555 archive.org) and HTTP links are replaced with working HTTPS links.
556
470 - Needs review.
471 - source: <pull.1589.v2.git.1695553041.gitgitgadget@gmail.com>
557 + Will merge to 'next'.
558 + source: <pull.1589.v3.git.1700796916.gitgitgadget@gmail.com>
559
560
561 * la/trailer-cleanups (2023-10-20) 3 commits
@@ -578,7 +665,7 @@ Release tarballs are available at:
665
666 Process to add some form of low-level unit tests has started.
667
581 - Will cook in 'next'.
668 + Will merge to 'master'.
669 source: <cover.1699555664.git.steadmon@google.com>
670
671
@@ -595,7 +682,7 @@ Release tarballs are available at:
682
683 Update the base topic to work with CMake builds.
684
598 - Will cook in 'next'.
685 + Will merge to 'master'.
686 source: <pull.1579.v3.git.1695640836.gitgitgadget@gmail.com>
687
688