What's cooking (2024/01 #07)
Junio C Hamano committed
Jan 23, 2024 at 14:29 UTC
1729afb6c6cde5d941af0e1663263d3f01c713fa
1 file changed
+139
-94
whats-cooking.txt
+139
-94
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2024, #06; Fri, 19)
2
+Subject: What's cooking in git.git (Jan 2024, #07; Tue, 23)
3
X-master-at: e02ecfcc534e2021aae29077a958dd11c3897e4c
4
-X-next-at: 4ca1e1f3c373c10320a345031bbeadd1413955dc
4
+X-next-at: 5fa4633015b7717427c4e333557e072f1a2b5e69
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2024, #06; Fri, 19)
7
+What's cooking in git.git (Jan 2024, #07; Tue, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,80 +46,78 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
49
-[Graduated to 'master']
49
+[New Topics]
50
51
-* bk/bisect-doc-fix (2024-01-10) 2 commits
52
- (merged to 'next' on 2024-01-12 at bdb3609554)
53
- + doc: refer to pathspec instead of path
54
- + doc: use singular form of repeatable path arg
51
+* al/t2400-depipe (2024-01-20) 1 commit
52
+ (merged to 'next' on 2024-01-22 at a20d4a9a7f)
53
+ + t2400: avoid losing exit status to pipes
54
56
- Synopsis fix.
57
- source: <20240103040207.661413-1-britton.kerin@gmail.com>
55
+ Coding style fix.
56
57
+ Will merge to 'master'.
58
+ source: <20240120021547.199-1-ach.lumap@gmail.com>
59
60
-* cp/t4129-pipefix (2024-01-10) 1 commit
61
- (merged to 'next' on 2024-01-12 at fd9b72b71a)
62
- + t4129: prevent loss of exit code due to the use of pipes
60
64
- Test update.
65
- source: <pull.1636.git.1704891257544.gitgitgadget@gmail.com>
61
+* kl/allow-working-in-dot-git-in-non-bare-repository (2024-01-20) 1 commit
62
+ - setup: allow cwd=.git w/ bareRepository=explicit
63
64
+ Loosen "disable repository discovery of a bare repository" check,
65
+ triggered by setting safe.bareRepository configuration variable to
66
+ 'explicit', to exclude the ".git/" directory inside a non-bare
67
+ repository from the check.
68
68
-* ps/gitlab-ci-static-analysis (2024-01-08) 1 commit
69
- (merged to 'next' on 2024-01-10 at 71af34de07)
70
- + ci: add job performing static analysis on GitLab CI
71
- (this branch is used by ps/gitlab-ci-macos.)
69
+ Will merge to 'next'.
70
+ source: <pull.1645.git.1705709303098.gitgitgadget@gmail.com>
71
73
- GitLab CI update.
74
- source: <1536a5ef07ad24dafb5d685b40099882f89e6cc5.1703761005.git.ps@pks.im>
72
73
+* rs/parse-options-with-keep-unknown-abbrev-fix (2024-01-22) 2 commits
74
+ (merged to 'next' on 2024-01-23 at a216b482cd)
75
+ + parse-options: simplify positivation handling
76
+ + parse-options: fully disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
77
77
-* ps/p4-use-ref-api (2024-01-11) 1 commit
78
- (merged to 'next' on 2024-01-12 at 3f89cf25f6)
79
- + git-p4: stop reaching into the refdb
78
+ "git diff --no-rename A B" did not disable rename detection but did
79
+ not trigger an error from the command line parser.
80
81
- "git p4" update to prepare for reftable
82
- source: <33d6a062ec56be33ed50a42a420be0b023f6f4cf.1704980814.git.ps@pks.im>
81
+ Will merge to 'master'.
82
+ source: <579fd5bc-3bfd-427f-b22d-dab5e7e56eb2@web.de>
83
+ source: <fb3c679a-5f00-4934-b028-6b2d081cd5b2@web.de>
84
85
85
-* ps/prompt-parse-HEAD-futureproof (2024-01-08) 2 commits
86
- (merged to 'next' on 2024-01-10 at f9515b9d89)
87
- + git-prompt: stop manually parsing HEAD with unknown ref formats
88
- + Merge branch 'ps/refstorage-extension' into ps/prompt-parse-HEAD-futureproof
86
+* pb/ci-github-skip-logs-for-broken-tests (2024-01-22) 1 commit
87
+ (merged to 'next' on 2024-01-23 at f5e3ab2092)
88
+ + ci(github): also skip logs of broken test cases
89
90
- Futureproof command line prompt support (in contrib/).
91
- source: <ef4e36a5a40c369da138242a8fdc9e12a846613b.1704356313.git.ps@pks.im>
90
+ GitHub CI update.
91
92
+ Will merge to 'master'.
93
+ cf. <dbe25fff-e1d4-41f2-8f8f-c538e8c2a77e@github.com>
94
+ source: <pull.1649.git.git.1705808313306.gitgitgadget@gmail.com>
95
94
-* rj/clarify-branch-doc-m (2024-01-08) 1 commit
95
- (merged to 'next' on 2024-01-10 at 432eaa2c6b)
96
- + branch: clarify <oldbranch> term
96
98
- Doc update.
99
- source: <d38e5a18-4d85-48f3-bc8b-8ca02ea683a4@gmail.com>
97
+* pb/complete-log-more (2024-01-22) 4 commits
98
+ - completion: complete missing 'git log' options
99
+ - completion: complete --encoding
100
+ - completion: complete --patch-with-raw
101
+ - completion: complete missing rev-list options
102
103
+ The completion script (in contrib/) learned more options that can
104
+ be used with "git log".
105
102
-* sk/mingw-owner-check-error-message-improvement (2024-01-10) 1 commit
103
- (merged to 'next' on 2024-01-12 at 05c56e151b)
104
- + mingw: give more details about unsafe directory's ownership
106
+ Will merge to 'next'.
107
+ source: <pull.1650.git.git.1705810071.gitgitgadget@gmail.com>
108
106
- In addition to (rather cryptic) Security Identifiers, show username
107
- and domain in the error message when we barf on mismatch between
108
- the Git directory and the current user on Windows.
109
- source: <20240108173837.20480-2-soekkle@freenet.de>
109
110
+* jc/reftable-core-fsync (2024-01-23) 1 commit
111
+ - reftable: honor core.fsync
112
112
-* tb/fetch-all-configuration (2024-01-08) 1 commit
113
- (merged to 'next' on 2024-01-12 at 6a05050382)
114
- + fetch: add new config option fetch.all
113
+ The write codepath for the reftable data learned to honor
114
+ core.fsync configuration.
115
116
- "git fetch" learned to pay attention to "fetch.all" configuration
117
- variable, which pretends as if "--all" was passed from the command
118
- line when no remote parameter was given.
119
- source: <20240108211832.47362-1-dev@tb6.eu>
116
+ Will merge to 'next'.
117
+ source: <pull.1654.git.git.1706035870956.gitgitgadget@gmail.com>
118
119
--------------------------------------------------
122
-[New Topics]
120
+[Cooking]
121
122
* kh/maintenance-use-xdg-when-it-should (2024-01-18) 4 commits
123
(merged to 'next' on 2024-01-19 at 9c8c7b2e9d)
@@ -155,17 +153,23 @@ Release tarballs are available at:
153
* ad/custom-merge-placeholder-for-symbolic-pathnames (2024-01-18) 1 commit
154
- merge-ll: expose revision names to custom drivers
155
156
+ The labels on conflict markers for the common ancestor, our version,
157
+ and the other version are available to custom 3-way merge driver
158
+ via %S, %X, and %Y placeholders.
159
+
160
+ Expecting a reroll.
161
+ cf. <xmqqcytvei3c.fsf@gitster.g>
162
source: <pull.1648.v3.git.git.1705615794307.gitgitgadget@gmail.com>
163
164
161
-* cp/unit-test-prio-queue (2024-01-17) 2 commits
162
- - SQUASH???
165
+* cp/unit-test-prio-queue (2024-01-22) 1 commit
166
- tests: move t0009-prio-queue.sh to the new unit testing framework
167
165
- source: <pull.1642.v3.git.1705502304219.gitgitgadget@gmail.com>
168
+ Migrate priority queue test to unit testing framework.
169
+ source: <pull.1642.v4.git.1705865326185.gitgitgadget@gmail.com>
170
171
168
-* jc/reffiles-tests (2024-01-19) 12 commits
172
+* jc/reffiles-tests (2024-01-22) 12 commits
173
- t5312: move reffiles specific tests to t0601
174
- t4202: move reffiles specific tests to t0600
175
- t3903: make drop stash test ref backend agnostic
@@ -179,6 +183,10 @@ Release tarballs are available at:
183
- remove REFFILES prerequisite for some tests in t1405 and t2017
184
- t3210: move to t0601
185
186
+ Tests on ref API are moved around to prepare for reftable.
187
+
188
+ Will merge to 'next'.
189
+ cf. <Za5TW-q4cKS8pNNc@tanuki>
190
source: <pull.1647.v2.git.git.1705695540.gitgitgadget@gmail.com>
191
192
@@ -186,38 +194,62 @@ Release tarballs are available at:
194
- revision: implement `git log --merge` also for rebase/cherry_pick/revert
195
- revision: ensure MERGE_HEAD is a ref in prepare_show_merge
196
197
+ "git log --merge" learned to pay attention to CHERRY_PICK_HEAD and
198
+ other kinds of *_HEAD pseudorefs.
199
+
200
+ Comments?
201
source: <xmqqzfxa9usx.fsf@gitster.g>
202
203
204
* nb/rebase-x-shell-docfix (2024-01-17) 1 commit
193
- - rebase: fix documentation about used shell in -x
205
+ (merged to 'next' on 2024-01-22 at db49e10354)
206
+ + rebase: fix documentation about used shell in -x
207
208
+ Doc update.
209
+
210
+ Will merge to 'master'.
211
source: <20240117085347.948960-1-nik.borisov@suse.com>
212
213
214
* tc/show-ref-exists-fix (2024-01-18) 1 commit
199
- - builtin/show-ref: treat directory as non-existing in --exists
215
+ (merged to 'next' on 2024-01-22 at 831452f2dd)
216
+ + builtin/show-ref: treat directory as non-existing in --exists
217
218
+ Update to a new feature recently added, "git show-ref --exists".
219
+
220
+ Will merge to 'master'.
221
source: <20240110141559.387815-2-toon@iotcl.com>
222
223
204
-* gt/t0024-style-fixes (2024-01-18) 2 commits
205
- - t0024: style fix
206
- - t0024: avoid losing exit status to pipes
224
+* gt/t0024-style-fixes (2024-01-20) 2 commits
225
+ (merged to 'next' on 2024-01-22 at 36b46efbd0)
226
+ + t0024: style fix
227
+ + t0024: avoid losing exit status to pipes
228
229
+ Coding style fix.
230
+
231
+ Will merge to 'master'.
232
source: <20240118215407.8609-1-shyamthakkar001@gmail.com>
233
234
211
-* jc/majordomo-to-subspace (2024-01-19) 1 commit
212
- - Docs: majordomo@vger.kernel.org has been decomissioned
235
+* jc/majordomo-to-subspace (2024-01-20) 1 commit
236
+ (merged to 'next' on 2024-01-22 at 6a95f43de4)
237
+ + Docs: majordomo@vger.kernel.org has been decomissioned
238
239
+ Doc update.
240
+
241
+ Will merge to 'master'.
242
source: <xmqqmst1hsd6.fsf@gitster.g>
243
244
245
* js/oss-fuzz-build-in-ci (2024-01-19) 2 commits
218
- - ci: build and run minimal fuzzers in GitHub CI
219
- - fuzz: fix fuzz test build rules
246
+ (merged to 'next' on 2024-01-22 at 2954da5a39)
247
+ + ci: build and run minimal fuzzers in GitHub CI
248
+ + fuzz: fix fuzz test build rules
249
250
+ oss-fuzz tests are built and run in CI.
251
+
252
+ Will merge to 'master'.
253
source: <cover.1705700054.git.steadmon@google.com>
254
255
@@ -228,22 +260,33 @@ Release tarballs are available at:
260
- refs: make `is_pseudoref_syntax()` stricter
261
- refs: expose `is_pseudoref_syntax()`
262
263
+ "git for-each-ref" filters its output with prefixes given from the
264
+ command line, but it did not honor an empty string to mean "pass
265
+ everything", which has been corrected.
266
+
267
+ Expecting a reroll.
268
+ cf. <CAOLa=ZQOcqGBJOSehok4BYGUE8RKtnE9eiJYogeT8E6NWZ25xw@mail.gmail.com>
269
+ cf. <Za-gF_Hp_lXViGWw@tanuki>
270
source: <20240119142705.139374-1-karthik.188@gmail.com>
271
272
273
* ps/not-so-many-refs-are-special (2024-01-19) 7 commits
235
- - Documentation: add "special refs" to the glossary
236
- - refs: redefine special refs
237
- - refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
238
- - sequencer: introduce functions to handle autostashes via refs
239
- - refs: convert AUTO_MERGE to become a normal pseudo-ref
240
- - sequencer: delete REBASE_HEAD in correct repo when picking commits
241
- - sequencer: clean up pseudo refs with REF_NO_DEREF
274
+ (merged to 'next' on 2024-01-22 at f70f463847)
275
+ + Documentation: add "special refs" to the glossary
276
+ + refs: redefine special refs
277
+ + refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
278
+ + sequencer: introduce functions to handle autostashes via refs
279
+ + refs: convert AUTO_MERGE to become a normal pseudo-ref
280
+ + sequencer: delete REBASE_HEAD in correct repo when picking commits
281
+ + sequencer: clean up pseudo refs with REF_NO_DEREF
282
+
283
+ Define "special ref" as a very narrow set that consists of
284
+ FETCH_HEAD and MERGE_HEAD, and clarify everything else that used to
285
+ be classified as such are actually just pseudorefs.
286
287
+ Will merge to 'master'.
288
source: <cover.1705659748.git.ps@pks.im>
289
245
---------------------------------------------------
246
-[Cooking]
290
291
* es/some-up-to-date-messages-must-stay (2024-01-12) 1 commit
292
(merged to 'next' on 2024-01-16 at 2b598f7de2)
@@ -399,12 +442,13 @@ Release tarballs are available at:
442
443
444
* en/diffcore-delta-final-line-fix (2024-01-18) 1 commit
402
- - diffcore-delta: avoid ignoring final 'line' of file
445
+ (merged to 'next' on 2024-01-22 at 7141d202cb)
446
+ + diffcore-delta: avoid ignoring final 'line' of file
447
448
Rename detection logic ignored the final line of a file if it is an
449
incomplete line.
450
407
- Will merge to 'next'.
451
+ Will merge to 'master'.
452
source: <pull.1637.v2.git.1705119973690.gitgitgadget@gmail.com>
453
454
@@ -435,8 +479,9 @@ Release tarballs are available at:
479
480
481
* ps/reftable-optimize-io (2024-01-18) 7 commits
438
- - reftable/stack: fix race in up-to-date check
439
- - reftable/stack: unconditionally reload stack after commit
482
+ (merged to 'next' on 2024-01-22 at b867e8b9a8)
483
+ + reftable/stack: fix race in up-to-date check
484
+ + reftable/stack: unconditionally reload stack after commit
485
(merged to 'next' on 2024-01-12 at 4096e880e0)
486
+ reftable/blocksource: use mmap to read tables
487
+ reftable/blocksource: refactor code to match our coding style
@@ -446,22 +491,22 @@ Release tarballs are available at:
491
492
Low-level I/O optimization for reftable.
493
449
- The two commits at the tip are new.
450
- Will merge to 'next' and then to 'master'?
494
+ Will merge to 'master'.
495
source: <cover.1704966670.git.ps@pks.im>
496
source: <cover.1705585037.git.ps@pks.im>
497
498
499
* rj/advice-disable-how-to-disable (2024-01-16) 2 commits
456
- - advice: allow disabling the automatic hint in advise_if_enabled()
457
- - Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how-to-disable
500
+ (merged to 'next' on 2024-01-23 at f456f4937d)
501
+ + advice: allow disabling the automatic hint in advise_if_enabled()
502
+ + Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how-to-disable
503
(this branch uses rj/advice-delete-branch-not-fully-merged.)
504
505
All conditional "advice" messages show how to turn them off, which
506
becomes repetitive. Add a configuration variable to omit the
507
instruction.
508
464
- Will merge to 'next'?
509
+ Will merge to 'master'.
510
source: <6a842ef8-b390-4739-9eef-e867d55ed5ea@gmail.com>
511
512
@@ -483,8 +528,7 @@ Release tarballs are available at:
528
529
Tracing fix.
530
486
- Waiting for a review response.
487
- cf. <xmqqbka27zu9.fsf@gitster.g>
531
+ Will merge to 'next'?
532
source: <20240103224054.1940209-1-delmerico@google.com>
533
534
@@ -646,19 +690,20 @@ Release tarballs are available at:
690
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
691
692
649
-* jx/remote-archive-over-smart-http (2024-01-16) 6 commits
650
- - transport-helper: call do_take_over() in process_connect
651
- - transport-helper: call do_take_over() in connect_helper
652
- - http-backend: new rpc-service for git-upload-archive
653
- - transport-helper: protocol-v2 supports upload-archive
654
- - remote-curl: supports git-upload-archive service
655
- - transport-helper: no connection restriction in connect_helper
693
+* jx/remote-archive-over-smart-http (2024-01-22) 6 commits
694
+ (merged to 'next' on 2024-01-23 at 5fa4633015)
695
+ + transport-helper: call do_take_over() in process_connect
696
+ + transport-helper: call do_take_over() in connect_helper
697
+ + http-backend: new rpc-service for git-upload-archive
698
+ + transport-helper: protocol v2 supports upload-archive
699
+ + remote-curl: supports git-upload-archive service
700
+ + transport-helper: no connection restriction in connect_helper
701
702
"git archive --remote=<remote>" learned to talk over the smart
703
http (aka stateless) transport.
704
660
- Will merge to 'next'?
661
- source: <cover.1705411391.git.zhiyou.jx@alibaba-inc.com>
705
+ Will merge to 'master'.
706
+ source: <cover.1705841443.git.zhiyou.jx@alibaba-inc.com>
707
708
709
* jc/rerere-cleanup (2023-08-25) 4 commits