What's cooking (2024/01 #04)
Junio C Hamano committed
Jan 11, 2024 at 17:38 UTC
60596280d84f556d5307148d0b63939313f57a7b
1 file changed
+73
-108
whats-cooking.txt
+73
-108
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2024, #03; Tue, 9)
2
+Subject: What's cooking in git.git (Jan 2024, #04; Thu, 11)
3
X-master-at: a54a84b333adbecf7bc4483c0e36ed5878cac17b
4
-X-next-at: 5e73029237c4506a7ca4fe5b7157ba7e1fc95d26
4
+X-next-at: 432eaa2c6beef636b4ea0f011b99512631f565d9
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2024, #03; Tue, 9)
7
+What's cooking in git.git (Jan 2024, #04; Thu, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,122 +46,115 @@ 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
+* cp/t4129-pipefix (2024-01-10) 1 commit
52
+ - t4129: prevent loss of exit code due to the use of pipes
53
+
54
+ Test update.
55
+
56
+ Will merge to 'next'.
57
+ source: <pull.1636.git.1704891257544.gitgitgadget@gmail.com>
58
51
-* en/header-cleanup (2023-12-26) 12 commits
52
- (merged to 'next' on 2023-12-28 at 1ccddc2a10)
53
- + treewide: remove unnecessary includes in source files
54
- + treewide: add direct includes currently only pulled in transitively
55
- + trace2/tr2_tls.h: remove unnecessary include
56
- + submodule-config.h: remove unnecessary include
57
- + pkt-line.h: remove unnecessary include
58
- + line-log.h: remove unnecessary include
59
- + http.h: remove unnecessary include
60
- + fsmonitor--daemon.h: remove unnecessary includes
61
- + blame.h: remove unnecessary includes
62
- + archive.h: remove unnecessary include
63
- + treewide: remove unnecessary includes in source files
64
- + treewide: remove unnecessary includes from header files
59
66
- Remove unused header "#include".
67
- source: <pull.1617.v2.git.1703351700.gitgitgadget@gmail.com>
60
+* rj/advice-delete-branch-not-fully-merged (2024-01-11) 3 commits
61
+ - branch: make the advice to force-deleting a conditional one
62
+ - advice: fix an unexpected leading space
63
+ - advice: sort the advice related lists
64
65
+ The error message given when "git branch -d branch" fails due to
66
+ commits unique to the branch has been split into an error and a new
67
+ conditional advice message.
68
70
-* en/sparse-checkout-eoo (2023-12-26) 2 commits
71
- (merged to 'next' on 2023-12-28 at 3ddf2ebab6)
72
- + sparse-checkout: be consistent with end of options markers
73
- + Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options
69
+ Will merge to 'next'?
70
+ source: <4aedc15c-4b3f-4f5e-abea-581b501600f8@gmail.com>
71
75
- "git sparse-checkout (add|set) --[no-]cone --end-of-options" did
76
- not handle "--end-of-options" correctly after a recent update.
77
- source: <pull.1625.v2.git.git.1703619562639.gitgitgadget@gmail.com>
72
73
+* en/diffcore-delta-final-line-fix (2024-01-11) 1 commit
74
+ - diffcore-delta: avoid ignoring final 'line' of file
75
80
-* jc/archive-list-with-extra-args (2023-12-21) 1 commit
81
- (merged to 'next' on 2023-12-28 at 2d5c20e67f)
82
- + archive: "--list" does not take further options
76
+ Rename detection logic ignored the final line of a file if it is an
77
+ incomplete line.
78
84
- "git archive --list extra garbage" silently ignored excess command
85
- line parameters, which has been corrected.
86
- source: <xmqqmsu3mnix.fsf@gitster.g>
79
+ Expecting a reroll.
80
+ cf. <xmqqedenearc.fsf@gitster.g>
81
+ source: <pull.1637.git.1705006074626.gitgitgadget@gmail.com>
82
83
89
-* jc/sparse-checkout-set-default-fix (2023-12-26) 1 commit
90
- (merged to 'next' on 2023-12-28 at a558eccf8e)
91
- + sparse-checkout: use default patterns for 'set' only !stdin
84
+* mj/gitweb-unreadable-config-error (2024-01-10) 1 commit
85
+ - gitweb: die when a configuration file cannot be read
86
93
- "git sparse-checkout set" added default patterns even when the
94
- patterns are being fed from the standard input, which has been
95
- corrected.
96
- source: <20231221065925.3234048-3-gitster@pobox.com>
87
+ When given an existing but unreadable file as a configuration file,
88
+ gitweb behaved as if the file did not exist at all, but now it
89
+ errors out. This is a change that may break backward compatibility.
90
91
+ Will merge to 'next'?
92
+ source: <20240110225709.30168-1-marcelo.jimenez@gmail.com>
93
99
-* ml/doc-merge-updates (2023-12-20) 2 commits
100
- (merged to 'next' on 2023-12-28 at 7a6329a219)
101
- + Documentation/git-merge.txt: use backticks for command wrapping
102
- + Documentation/git-merge.txt: fix reference to synopsis
94
104
- Doc update.
105
- source: <20231220195342.17590-1-mi.al.lohmann@gmail.com>
95
+* ps/completion-with-reftable-fix (2024-01-11) 2 commits
96
+ - completion: silence pseudoref existence check
97
+ - t9902: verify that completion does not print anything
98
99
+ Completion update to prepare for reftable
100
108
-* rs/fast-import-simplify-mempool-allocation (2023-12-26) 1 commit
109
- (merged to 'next' on 2023-12-28 at 16e6dd2a69)
110
- + fast-import: use mem_pool_calloc()
101
+ Will merge to 'next'.
102
+ source: <cover.1704969119.git.ps@pks.im>
103
112
- Code simplification.
113
- source: <50c1f410-ca37-4c1c-a28b-3e9fad49f2b4@web.de>
104
105
+* ps/p4-use-ref-api (2024-01-11) 1 commit
106
+ - git-p4: stop reaching into the refdb
107
116
-* rs/mem-pool-improvements (2023-12-28) 2 commits
117
- (merged to 'next' on 2023-12-28 at aa03d9441c)
118
- + mem-pool: simplify alignment calculation
119
- + mem-pool: fix big allocations
108
+ "git p4" update to prepare for reftable
109
121
- MemPool allocator fixes.
122
- source: <fa89d269-1a23-4ed6-bebc-30c0b629f444@web.de>
110
+ Will merge to 'next'.
111
+ source: <33d6a062ec56be33ed50a42a420be0b023f6f4cf.1704980814.git.ps@pks.im>
112
113
--------------------------------------------------
125
-[New Topics]
114
+[Cooking]
115
116
* ps/gitlab-ci-static-analysis (2024-01-08) 1 commit
128
- - ci: add job performing static analysis on GitLab CI
117
+ (merged to 'next' on 2024-01-10 at 71af34de07)
118
+ + ci: add job performing static analysis on GitLab CI
119
120
GitLab CI update.
121
132
- Will merge to 'next'.
122
+ Will merge to 'master'.
123
source: <1536a5ef07ad24dafb5d685b40099882f89e6cc5.1703761005.git.ps@pks.im>
124
125
126
* ps/prompt-parse-HEAD-futureproof (2024-01-08) 2 commits
137
- - git-prompt: stop manually parsing HEAD with unknown ref formats
138
- - Merge branch 'ps/refstorage-extension' into ps/prompt-parse-HEAD-futureproof
127
+ (merged to 'next' on 2024-01-10 at f9515b9d89)
128
+ + git-prompt: stop manually parsing HEAD with unknown ref formats
129
+ + Merge branch 'ps/refstorage-extension' into ps/prompt-parse-HEAD-futureproof
130
(this branch uses ps/refstorage-extension.)
131
132
Futureproof command line prompt support (in contrib/).
133
143
- Will merge to 'next'.
134
+ Will merge to 'master'.
135
source: <ef4e36a5a40c369da138242a8fdc9e12a846613b.1704356313.git.ps@pks.im>
136
137
147
-* ps/reftable-optimize-io (2024-01-08) 4 commits
138
+* ps/reftable-optimize-io (2024-01-11) 5 commits
139
- reftable/blocksource: use mmap to read tables
140
+ - reftable/blocksource: refactor code to match our coding style
141
- reftable/stack: use stat info to avoid re-reading stack list
142
- reftable/stack: refactor reloading to use file descriptor
143
- reftable/stack: refactor stack reloading to have common exit path
144
145
Low-level I/O optimization for reftable.
146
155
- Will merge to 'next'?
156
- source: <cover.1704714575.git.ps@pks.im>
147
+ Will merge to 'next'.
148
+ source: <cover.1704966670.git.ps@pks.im>
149
150
151
* rj/clarify-branch-doc-m (2024-01-08) 1 commit
160
- - branch: clarify <oldbranch> term
152
+ (merged to 'next' on 2024-01-10 at 432eaa2c6b)
153
+ + branch: clarify <oldbranch> term
154
155
Doc update.
156
164
- Will merge to 'next'.
157
+ Will merge to 'master'.
158
source: <d38e5a18-4d85-48f3-bc8b-8ca02ea683a4@gmail.com>
159
160
@@ -197,11 +190,11 @@ Release tarballs are available at:
190
191
Tighten URL checks fsck makes in a URL recorded for submodules.
192
200
- Will merge to 'next'?
193
+ Expecting a reroll (and review response).
194
+ cf. <20240110103812.GB16674@coredump.intra.peff.net>
195
+ cf. <ZZ46MrjSocJl-kpU@tanuki>
196
source: <pull.1635.git.1704822817.gitgitgadget@gmail.com>
197
203
---------------------------------------------------
204
-[Cooking]
198
199
* ms/rebase-insnformat-doc-fix (2024-01-03) 1 commit
200
(merged to 'next' on 2024-01-04 at d68f2be39b)
@@ -235,14 +228,14 @@ Release tarballs are available at:
228
source: <20240103224054.1940209-1-delmerico@google.com>
229
230
238
-* sk/mingw-owner-check-error-message-improvement (2024-01-08) 1 commit
231
+* sk/mingw-owner-check-error-message-improvement (2024-01-10) 1 commit
232
- mingw: give more details about unsafe directory's ownership
233
234
In addition to (rather cryptic) Security Identifiers, show username
235
and domain in the error message when we barf on mismatch between
236
the Git directory and the current user.
237
245
- Will merge to 'next'?
238
+ Will merge to 'next'.
239
source: <20240108173837.20480-2-soekkle@freenet.de>
240
241
@@ -302,6 +295,8 @@ Release tarballs are available at:
295
Instead of manually creating refs/ hierarchy on disk upon a
296
creation of a secondary worktree, which is only usable via the
297
files backend, use the refs API to populate it.
298
+
299
+ Needs review.
300
source: <cover.1704705733.git.ps@pks.im>
301
302
@@ -356,19 +351,20 @@ Release tarballs are available at:
351
352
Move test-ctype helper to the unit-test framework.
353
359
- Almost there.
354
+ Expecting a (hopefully small and final) reroll.
355
cf. <a087f57c-ce72-45c7-8182-f38d0aca9030@web.de>
356
cf. <33c81610-0958-49da-b702-ba8d96ecf1d3@gmail.com>
357
source: <20240105161413.10422-1-ach.lumap@gmail.com>
358
359
365
-* bk/bisect-doc-fix (2023-12-27) 1 commit
360
+* bk/bisect-doc-fix (2024-01-10) 2 commits
361
+ - doc: refer to pathspec instead of path
362
- doc: use singular form of repeatable path arg
363
364
Synopsis fix.
365
370
- Expecting a reroll.
371
- source: <3d46bca1-96d4-43ba-a912-1f7c76942287@smtp-relay.sendinblue.com>
366
+ Will merge to 'next'.
367
+ source: <20240103040207.661413-1-britton.kerin@gmail.com>
368
369
370
* ja/doc-placeholders-fix (2023-12-26) 2 commits
@@ -616,34 +612,3 @@ Release tarballs are available at:
612
613
Not ready to be reviewed yet.
614
source: <20230824205456.1231371-1-gitster@pobox.com>
619
-
620
---------------------------------------------------
621
-[Discarded]
622
-
623
-* jc/sparse-checkout-eoo (2023-12-21) 4 commits
624
- . sparse-checkout: tighten add_patterns_from_input()
625
- . sparse-checkout: use default patterns for 'set' only !stdin
626
- . SQUASH??? end-of-options test
627
- . sparse-checkout: take care of "--end-of-options" in set/add/check-rules
628
-
629
- "git sparse-checkout (add|set) --[no-]cone --end-of-options" did
630
- not handle "--end-of-options" correctly after a recent update.
631
-
632
- Superseded by the en/sparse-checkout-eoo topic.
633
- source: <20231221065925.3234048-1-gitster@pobox.com>
634
-
635
-
636
-* tb/merge-tree-write-pack (2023-10-23) 5 commits
637
- . builtin/merge-tree.c: implement support for `--write-pack`
638
- . bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
639
- . bulk-checkin: introduce `index_blob_bulk_checkin_incore()`
640
- . bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types
641
- . bulk-checkin: extract abstract `bulk_checkin_source`
642
-
643
- "git merge-tree" learned "--write-pack" to record its result
644
- without creating loose objects.
645
-
646
- Broken when an object created during a merge is needed to continue merge
647
- cf. <CABPp-BEfy9VOvimP9==ry_rZXu=metOQ8s=_-XiG_Pdx9c06Ww@mail.gmail.com>
648
- cf. <ZZWOtnP2IHNldcy6@nand.local>
649
- source: <cover.1698101088.git.me@ttaylorr.com>