What's cooking (2023/11) #02
Junio C Hamano committed
Nov 6, 2023 at 10:42 UTC
3a49405f0bfb8ab57ad83670faad8fb1afbc9cbe
1 file changed
+108
-223
whats-cooking.txt
+108
-223
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2023, #01; Thu, 2)
3
-X-master-at: 692be87cbba55e8488f805d236f2ad50483bd7d5
4
-X-next-at: 2469dfc402e53bfa18aaef393af11393d21a9522
2
+Subject: What's cooking in git.git (Nov 2023, #02; Mon, 6)
3
+X-master-at: bc5204569f7db44d22477485afd52ea410d83743
4
+X-next-at: f7406347cdb3b53eeb25238b9d8d215caf633a80
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2023, #01; Thu, 2)
7
+What's cooking in git.git (Nov 2023, #02; Mon, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,6 +48,90 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[New Topics]
50
51
+* jw/git-add-attr-pathspec (2023-11-04) 1 commit
52
+ - attr: enable attr pathspec magic for git-add and git-stash
53
+
54
+ "git add" and "git stash" learned to support the ":(attr:...)"
55
+ magic pathspec.
56
+
57
+ Will merge to 'next'?
58
+ source: <20231103163449.1578841-1-jojwang@google.com>
59
+
60
+
61
+* la/strvec-header-fix (2023-11-03) 1 commit
62
+ (merged to 'next' on 2023-11-03 at db23d8a911)
63
+ + strvec: drop unnecessary include of hex.h
64
+
65
+ Code clean-up.
66
+
67
+ Will merge to 'master'.
68
+ source: <pull.1608.git.1698958277454.gitgitgadget@gmail.com>
69
+
70
+
71
+* jk/chunk-bounds (2023-11-04) 1 commit
72
+ (merged to 'next' on 2023-11-06 at ae9fbc1700)
73
+ + t: avoid perl's pack/unpack "Q" specifier
74
+
75
+ Test portability fix.
76
+
77
+ Will merge to 'master'.
78
+ source: <20231103162019.GB1470570@coredump.intra.peff.net>
79
+
80
+
81
+* js/ci-use-macos-13 (2023-11-03) 1 commit
82
+ (merged to 'next' on 2023-11-06 at f7406347cd)
83
+ + ci: upgrade to using macos-13
84
+
85
+ Replace macos-12 used at GitHub CI with macos-13.
86
+
87
+ Will merge to 'master'.
88
+ source: <pull.1607.git.1698996455218.gitgitgadget@gmail.com>
89
+
90
+--------------------------------------------------
91
+[Stalled]
92
+
93
+* pw/rebase-sigint (2023-09-07) 1 commit
94
+ - rebase -i: ignore signals when forking subprocesses
95
+
96
+ If the commit log editor or other external programs (spawned via
97
+ "exec" insn in the todo list) receive internactive signal during
98
+ "git rebase -i", it caused not just the spawned program but the
99
+ "Git" process that spawned them, which is often not what the end
100
+ user intended. "git" learned to ignore SIGINT and SIGQUIT while
101
+ waiting for these subprocesses.
102
+
103
+ Expecting a reroll.
104
+ cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
105
+ source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
106
+
107
+
108
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
109
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
110
+
111
+ "git cherry-pick A" that replays a single commit stopped before
112
+ clobbering local modification, but "git cherry-pick A..B" did not,
113
+ which has been corrected.
114
+
115
+ Expecting a reroll.
116
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
117
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
118
+
119
+
120
+* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
121
+ - diff-lib: fix check_removed() when fsmonitor is active
122
+ - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
123
+ - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
124
+ (this branch uses jc/fake-lstat.)
125
+
126
+ The optimization based on fsmonitor in the "diff --cached"
127
+ codepath is resurrected with the "fake-lstat" introduced earlier.
128
+
129
+ It is unknown if the optimization is worth resurrecting, but in case...
130
+ source: <xmqqr0n0h0tw.fsf@gitster.g>
131
+
132
+--------------------------------------------------
133
+[Cooking]
134
+
135
* jc/strbuf-comment-line-char (2023-11-01) 4 commits
136
- strbuf: move env-using functions to environment.c
137
- strbuf: make add_lines() public
@@ -72,6 +156,7 @@ Release tarballs are available at:
156
+ builtin/show-ref: fix leaking string buffer
157
+ builtin/show-ref: split up different subcommands
158
+ builtin/show-ref: convert pattern to a local variable
159
+ (this branch is used by ps/ref-tests-update.)
160
161
Teach "git show-ref" a mode to check the existence of a ref.
162
@@ -90,23 +175,25 @@ Release tarballs are available at:
175
176
177
* bc/merge-file-object-input (2023-11-02) 2 commits
93
- - merge-file: add an option to process object IDs
94
- - git-merge-file doc: drop "-file" from argument placeholders
178
+ (merged to 'next' on 2023-11-02 at ccbba9416c)
179
+ + merge-file: add an option to process object IDs
180
+ + git-merge-file doc: drop "-file" from argument placeholders
181
182
"git merge-file" learns a mode to read three contents to be merged
183
from blob objects.
184
99
- Will merge to 'next'.
185
+ Will merge to 'master'.
186
source: <20231101192419.794162-1-sandals@crustytoothpaste.net>
187
188
103
-* jc/test-i18ngrep (2023-10-31) 2 commits
104
- - tests: teach callers of test_i18ngrep to use test_grep
105
- - test framework: further deprecate test_i18ngrep
189
+* jc/test-i18ngrep (2023-11-02) 2 commits
190
+ (merged to 'next' on 2023-11-03 at 78406f8d94)
191
+ + tests: teach callers of test_i18ngrep to use test_grep
192
+ + test framework: further deprecate test_i18ngrep
193
194
Another step to deprecate test_i18ngrep.
195
109
- Will merge to 'next'.
196
+ Will merge to 'master'.
197
source: <20231031052330.3762989-1-gitster@pobox.com>
198
199
@@ -121,204 +208,15 @@ Release tarballs are available at:
208
209
210
* jk/tree-name-and-depth-limit (2023-11-02) 1 commit
124
- - max_tree_depth: lower it for MSVC to avoid stack overflows
211
+ (merged to 'next' on 2023-11-06 at 041423344c)
212
+ + max_tree_depth: lower it for MSVC to avoid stack overflows
213
214
Further limit tree depth max to avoid Windows build running out of
215
the stack space.
216
129
- Will merge to 'next' and then to 'master'.
217
+ Will merge to 'master'.
218
source: <pull.1604.v2.git.1698843810814.gitgitgadget@gmail.com>
219
132
---------------------------------------------------
133
-[Graduated to 'master']
134
-
135
-* da/t7601-style-fix (2023-10-18) 1 commit
136
- (merged to 'next' on 2023-10-20 at 8e7326458c)
137
- + t7601: use "test_path_is_file" etc. instead of "test -f"
138
-
139
- Coding style update.
140
- source: <20231018124538.68549-2-anonolitunya@gmail.com>
141
-
142
-
143
-* ii/branch-error-messages-update (2023-10-23) 1 commit
144
- (merged to 'next' on 2023-10-23 at 3d00599173)
145
- + builtin/branch.c: adjust error messages to coding guidelines
146
-
147
- Error message update.
148
- source: <20231023160656.4341-1-isokenjune@gmail.com>
149
-
150
-
151
-* jc/am-doc-whitespace-action-fix (2023-10-18) 1 commit
152
- (merged to 'next' on 2023-10-20 at 9200d39c08)
153
- + am: align placeholder for --whitespace option with apply
154
-
155
- Docfix.
156
- source: <xmqqwmvjzeqd.fsf@gitster.g>
157
-
158
-
159
-* jc/attr-tree-config (2023-10-13) 2 commits
160
- (merged to 'next' on 2023-10-19 at 202dc1c453)
161
- + attr: add attr.tree for setting the treeish to read attributes from
162
- + attr: read attributes from HEAD when bare repo
163
-
164
- The attribute subsystem learned to honor `attr.tree` configuration
165
- that specifies which tree to read the .gitattributes files from.
166
- source: <pull.1577.v5.git.git.1697218770.gitgitgadget@gmail.com>
167
-
168
-
169
-* jc/commit-new-underscore-index-fix (2023-10-17) 1 commit
170
- (merged to 'next' on 2023-10-22 at 0e4787303d)
171
- + commit: do not use cryptic "new_index" in end-user facing messages
172
-
173
- Message fix.
174
- source: <xmqqo7gwvd8c.fsf_-_@gitster.g>
175
-
176
-
177
-* jc/update-list-references-to-lore (2023-10-06) 1 commit
178
- (merged to 'next' on 2023-10-19 at 83a721a137)
179
- + doc: update list archive reference to use lore.kernel.org
180
-
181
- Doc update.
182
- source: <xmqq7cnz741s.fsf@gitster.g>
183
-
184
-
185
-* jk/send-email-fix-addresses-from-composed-messages (2023-10-20) 3 commits
186
- (merged to 'next' on 2023-10-22 at 43221cc3a4)
187
- + send-email: handle to/cc/bcc from --compose message
188
- + Revert "send-email: extract email-parsing code into a subroutine"
189
- + doc/send-email: mention handling of "reply-to" with --compose
190
-
191
- The codepath to handle recipient addresses `git send-email
192
- --compose` learns from the user was completely broken, which has
193
- been corrected.
194
- source: <20231020100343.GA2194322@coredump.intra.peff.net>
195
-
196
-
197
-* jm/bisect-run-synopsis-fix (2023-10-23) 1 commit
198
- (merged to 'next' on 2023-10-23 at 8dfa3ed356)
199
- + doc/git-bisect: clarify `git bisect run` syntax
200
-
201
- Doc and usage message update.
202
- source: <pull.1602.v2.git.1698088990478.gitgitgadget@gmail.com>
203
-
204
-
205
-* kh/pathspec-error-wo-repository-fix (2023-10-20) 1 commit
206
- (merged to 'next' on 2023-10-22 at 4f77af1e40)
207
- + grep: die gracefully when outside repository
208
-
209
- The pathspec code carelessly dereferenced NULL while emitting an
210
- error message, which has been corrected.
211
- source: <5c8ef6bec1c99e0fae7ada903885a8e77f8137f9.1697819838.git.code@khaugsbakk.name>
212
-
213
-
214
-* mm/p4-symlink-with-lfs (2023-10-19) 1 commit
215
- (merged to 'next' on 2023-10-20 at 9c05ce7e85)
216
- + git-p4 shouldn't attempt to store symlinks in LFS
217
-
218
- "git p4" tried to store symlinks to LFS when told, but has been
219
- fixed not to do so, because it does not make sense.
220
- source: <20231019002558.867830-1-mmcclain@noprivs.com>
221
-
222
-
223
-* ms/doc-push-fix (2023-10-20) 1 commit
224
- (merged to 'next' on 2023-10-22 at 7ce3cef56b)
225
- + git-push doc: more visibility for -q option
226
-
227
- Docfix.
228
- source: <20231020184627.14336-1-msuchanek@suse.de>
229
-
230
-
231
-* ni/die-message-fix-for-git-add (2023-10-17) 1 commit
232
- (merged to 'next' on 2023-10-22 at f46c5dfd63)
233
- + builtin/add.c: clean up die() messages
234
-
235
- Message updates.
236
- source: <20231017113946.747-1-naomi.ibeh69@gmail.com>
237
-
238
-
239
-* ob/rebase-cleanup (2023-10-20) 3 commits
240
- (merged to 'next' on 2023-10-22 at 05e14ca4fc)
241
- + rebase: move parse_opt_keep_empty() down
242
- + rebase: handle --strategy via imply_merge() as well
243
- + rebase: simplify code related to imply_merge()
244
-
245
- Code clean-up.
246
- source: <20231020093654.922890-1-oswald.buddenhagen@gmx.de>
247
-
248
-
249
-* ps/git-repack-doc-fixes (2023-10-16) 2 commits
250
- (merged to 'next' on 2023-10-22 at df64849f26)
251
- + doc/git-repack: don't mention nonexistent "--unpacked" option
252
- + doc/git-repack: fix syntax for `-g` shorthand option
253
-
254
- Doc updates.
255
- source: <cover.1697440686.git.ps@pks.im>
256
-
257
-
258
-* sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits
259
- (merged to 'next' on 2023-10-18 at 575d767f9a)
260
- + t/README: fix multi-prerequisite example
261
- + doc/gitk: s/sticked/stuck/
262
- + git-jump: admit to passing merge mode args to ls-files
263
- + doc/diff-options: improve wording of the log.diffMerges mention
264
- + doc: fix some typos, grammar and wording issues
265
-
266
- Many typos, ungrammatical sentences and wrong phrasing have been
267
- fixed.
268
- source: <20231003082107.3002173-1-stepnem@smrk.net>
269
-
270
-
271
-* wx/merge-ort-comment-typofix (2023-10-21) 1 commit
272
- (merged to 'next' on 2023-10-22 at ad1e33883a)
273
- + merge-ort.c: fix typo 'neeed' to 'needed'
274
-
275
- Typofix.
276
- source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com>
277
-
278
---------------------------------------------------
279
-[Stalled]
280
-
281
-* pw/rebase-sigint (2023-09-07) 1 commit
282
- - rebase -i: ignore signals when forking subprocesses
283
-
284
- If the commit log editor or other external programs (spawned via
285
- "exec" insn in the todo list) receive internactive signal during
286
- "git rebase -i", it caused not just the spawned program but the
287
- "Git" process that spawned them, which is often not what the end
288
- user intended. "git" learned to ignore SIGINT and SIGQUIT while
289
- waiting for these subprocesses.
290
-
291
- Expecting a reroll.
292
- cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
293
- source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
294
-
295
-
296
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
297
- - cherry-pick: refuse cherry-pick sequence if index is dirty
298
-
299
- "git cherry-pick A" that replays a single commit stopped before
300
- clobbering local modification, but "git cherry-pick A..B" did not,
301
- which has been corrected.
302
-
303
- Expecting a reroll.
304
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
305
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
306
-
307
-
308
-* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
309
- - diff-lib: fix check_removed() when fsmonitor is active
310
- - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
311
- - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
312
- (this branch uses jc/fake-lstat.)
313
-
314
- The optimization based on fsmonitor in the "diff --cached"
315
- codepath is resurrected with the "fake-lstat" introduced earlier.
316
-
317
- It is unknown if the optimization is worth resurrecting, but in case...
318
- source: <xmqqr0n0h0tw.fsf@gitster.g>
319
-
320
---------------------------------------------------
321
-[Cooking]
220
221
* ar/submitting-patches-doc-update (2023-10-24) 1 commit
222
(merged to 'next' on 2023-10-30 at e140009eb6)
@@ -380,7 +278,7 @@ Release tarballs are available at:
278
source: <cover.1698843660.git.ps@pks.im>
279
280
383
-* ps/ref-tests-update (2023-10-24) 9 commits
281
+* ps/ref-tests-update (2023-11-03) 10 commits
282
- t: mark several tests that assume the files backend with REFFILES
283
- t7900: assert the absence of refs via git-for-each-ref(1)
284
- t7300: assert exact states of repo
@@ -390,11 +288,13 @@ Release tarballs are available at:
288
- t: convert tests to not access symrefs via the filesystem
289
- t: convert tests to not write references via the filesystem
290
- t: allow skipping expected object ID in `ref-store update-ref`
291
+ - Merge branch 'ps/show-ref' into ps/ref-tests-update
292
+ (this branch uses ps/show-ref.)
293
294
Update ref-related tests.
295
296
Will merge to 'next'?
397
- source: <cover.1698156169.git.ps@pks.im>
297
+ source: <cover.1698914571.git.ps@pks.im>
298
299
300
* rs/fix-arghelp (2023-10-29) 1 commit
@@ -582,7 +482,7 @@ Release tarballs are available at:
482
source: <20231026101109.43110-1-karthik.188@gmail.com>
483
484
585
-* cc/git-replay (2023-10-10) 14 commits
485
+* cc/git-replay (2023-11-03) 14 commits
486
- replay: stop assuming replayed branches do not diverge
487
- replay: add --contained to rebase contained branches
488
- replay: add --advance or 'cherry-pick' mode
@@ -601,9 +501,8 @@ Release tarballs are available at:
501
Introduce "git replay", a tool meant on the server side without
502
working tree to recreate a history.
503
604
- Expectting a (hopefully final and quick) reroll.
605
- cf. <bd872b81-80a9-5e4e-dcb6-faebc9671848@gmx.de>
606
- source: <20231010123847.2777056-1-christian.couder@gmail.com>
504
+ Will merge to 'next'?
505
+ source: <20231102135151.843758-1-christian.couder@gmail.com>
506
507
508
* ak/color-decorate-symbols (2023-10-23) 7 commits
@@ -780,17 +679,3 @@ Release tarballs are available at:
679
680
Needs review.
681
source: <2e24ca9b-9c5f-f4df-b9f8-6574a714dfb2@gmail.com>
783
-
784
---------------------------------------------------
785
-[Discarded]
786
-
787
-* rs/parse-options-value-int (2023-09-18) 2 commits
788
- . parse-options: use and require int pointer for OPT_CMDMODE
789
- . parse-options: add int value pointer to struct option
790
-
791
- A bit of type safety for the "value" pointer used in the
792
- parse-options API.
793
-
794
- Retracted.
795
- cf. <4014e490-c6c1-453d-b0ed-645220e3e614@web.de>
796
- source: <e6d8a291-03de-cfd3-3813-747fc2cad145@web.de>