What's cooking (2023/04 #04)
Junio C Hamano committed
Apr 14, 2023 at 15:30 UTC
a447e9bb622a7743add0b6bfa9fe819f3d470013
1 file changed
+286
-218
whats-cooking.txt
+286
-218
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2023, #03; Tue, 11)
2
+Subject: What's cooking in git.git (Apr 2023, #04; Fri, 14)
3
X-master-at: 9857273be005833c71e2d16ba48e193113e12276
4
-X-next-at: 15816b0a8ae864e36a03af255e1d048f21d56b4d
4
+X-next-at: 2798986c608c3adb1834690c0b9fd90882561004
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2023, #03; Tue, 11)
7
+What's cooking in git.git (Apr 2023, #04; Fri, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -44,188 +44,128 @@ Release tarballs are available at:
44
45
https://www.kernel.org/pub/software/scm/git/
46
47
---------------------------------------------------
48
-[Graduated to 'master']
49
-
50
-* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits
51
- (merged to 'next' on 2023-04-06 at 8a9dfa25d4)
52
- + t2107: fix mention of the_index.cache_changed
53
- + t3060: fix mention of function prune_index
54
-
55
- Comment updates.
56
- source: <20230331143604.82040-2-rybak.a.v@gmail.com>
57
-
58
-
59
-* dw/doc-submittingpatches-grammofix (2023-04-05) 1 commit
60
- (merged to 'next' on 2023-04-06 at 1c48670236)
61
- + SubmittingPatches: clarify MUA discussion with "the"
62
-
63
- Grammofix.
64
- source: <ZC0yey+S+OD/S2tt@trent-reznor>
65
-
66
-
67
-* fc/doc-manpage-base-url-fix (2023-04-05) 1 commit
68
- (merged to 'next' on 2023-04-07 at c764614b80)
69
- + doc: remove manpage-base-url workaround
70
-
71
- Modernize manpage generation toolchain.
72
- source: <20230322000815.132128-1-felipe.contreras@gmail.com>
73
-
74
-
75
-* jc/clone-object-format-from-void (2023-04-05) 1 commit
76
- (merged to 'next' on 2023-04-07 at 78eb68f3fa)
77
- + clone: propagate object-format when cloning from void
78
-
79
- "git clone" from an empty repository learned to propagate the
80
- choice of the hash algorithm from the source repository to the
81
- newly created repository.
82
- source: <xmqq355euj2i.fsf@gitster.g>
83
-
84
-
85
-* jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit
86
- (merged to 'next' on 2023-04-06 at 17f4690220)
87
- + e-mail workflow: Message-ID is spelled with ID in both capital letters
88
-
89
- Consistently spell "Message-ID" as such, not "Message-Id".
90
- source: <xmqqsfhgnmqg.fsf@gitster.g>
91
-
92
-
93
-* jk/use-perl-path-consistently (2023-04-06) 1 commit
94
- (merged to 'next' on 2023-04-07 at 3aa36fcb80)
95
- + t/lib-httpd: pass PERL_PATH to CGI scripts
96
-
97
- Tests had a few places where we ignored PERL_PATH and blindly used
98
- /usr/bin/perl, which have been corrected.
99
- source: <20230406093602.GD2215039@coredump.intra.peff.net>
100
-
101
-
102
-* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit
103
- (merged to 'next' on 2023-04-06 at 5a8b6068f3)
104
- + object-info: init request_info before reading arg
105
-
106
- Correct use of an uninitialized structure member.
107
- source: <20230402130557.17662-1-worldhello.net@gmail.com>
108
-
109
-
110
-* ws/sparse-check-rules (2023-03-27) 2 commits
111
- (merged to 'next' on 2023-04-06 at 3fd16233c7)
112
- + builtin/sparse-checkout: add check-rules command
113
- + builtin/sparse-checkout: remove NEED_WORK_TREE flag
114
-
115
- "git sparse-checkout" command learns a debugging aid for the sparse
116
- rule definitions.
117
- source: <pull.1488.v2.git.1679903703.gitgitgadget@gmail.com>
118
-
47
--------------------------------------------------
48
[New Topics]
49
122
-* la/mfc-markup-fix (2023-04-06) 1 commit
123
- (merged to 'next' on 2023-04-10 at 05415e1c90)
124
- + MyFirstContribution: render literal *
50
+* gc/doc-cocci-updates (2023-04-12) 2 commits
51
+ - cocci: codify authoring and reviewing practices
52
+ - cocci: add headings to and reword README
53
126
- Documentation mark-up fix.
54
+ Update documentation regarding Coccinelle patches.
55
128
- Will merge to 'master'.
129
- source: <pull.1510.git.1680661709616.gitgitgadget@gmail.com>
56
+ Comments?
57
+ source: <pull.1495.git.git.1681329955.gitgitgadget@gmail.com>
58
59
132
-* ar/t2024-checkout-output-fix (2023-04-10) 1 commit
133
- - t2024: fix loose/strict local base branch DWIM test
60
+* jk/protocol-cap-parse-fix (2023-04-14) 7 commits
61
+ - v0 protocol: use size_t for capability length/offset
62
+ - t5512: test "ls-remote --heads --symref" filtering with v0 and v2
63
+ - t5512: allow any protocol version for filtered symref test
64
+ - t5512: add v2 support for "ls-remote --symref" test
65
+ - v0 protocol: fix sha1/sha256 confusion for capabilities^{}
66
+ - t5512: stop referring to "v1" protocol
67
+ - v0 protocol: fix infinite loop when parsing multi-valued capabilities
68
135
- Test fix.
69
+ The code to parse capability list for v0 on-wire protocol fell into
70
+ an infinite loop when a capability appears multiple times, which
71
+ has been corrected.
72
73
Will merge to 'next'.
138
- source: <20230408205450.569548-1-rybak.a.v@gmail.com>
139
-
140
-
141
-* fc/doc-stop-using-manversion (2023-04-10) 1 commit
142
- - doc: simplify man version
143
-
144
- Doc build simplification.
145
-
146
- Will merge to 'next'?
147
- source: <20230408001829.11031-1-felipe.contreras@gmail.com>
148
-
149
-
150
-* rn/sparse-diff-index (2023-04-10) 1 commit
151
- - diff-index: enable sparse index
152
-
153
- "git diff-index" command has been taught to work better with the
154
- sparse index.
74
+ source: <20230414212404.GA639653@coredump.intra.peff.net>
75
156
- Comments?
157
- source: <20230408112342.404318-1-nanth.raghul@gmail.com>
76
77
+* kh/doc-interpret-trailers-updates (2023-04-12) 4 commits
78
+ - doc: interpret-trailers: fix example
79
+ - doc: interpret-trailers: don’t use deprecated config
80
+ - doc: interpret-trailers: use input redirection
81
+ - doc: interpret-trailers: don’t use heredoc in examples
82
160
-* rs/get-tar-commit-id-use-defined-const (2023-04-10) 1 commit
161
- - get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
83
+ Doc update.
84
163
- Code clean-up to replace a hardcoded constant with a CPP macro.
85
+ Expecting a reroll.
86
+ cf. <xmqqcz487qds.fsf@gitster.g>, <xmqqjzyg7qdw.fsf@gitster.g>
87
+ source: <cover.1681326818.git.code@khaugsbakk.name>
88
+
89
+
90
+* ps/fix-geom-repack-with-alternates (2023-04-14) 10 commits
91
+ - repack: disable writing bitmaps when doing a local repack
92
+ - repack: honor `-l` when calculating pack geometry
93
+ - t/helper: allow chmtime to print verbosely without modifying mtime
94
+ - pack-objects: extend test coverage of `--stdin-packs` with alternates
95
+ - pack-objects: fix error when same packfile is included and excluded
96
+ - pack-objects: fix error when packing same pack twice
97
+ - pack-objects: split out `--stdin-packs` tests into separate file
98
+ - repack: fix generating multi-pack-index with only non-local packs
99
+ - repack: fix trying to use preferred pack in alternates
100
+ - midx: fix segfault with no packs and invalid preferred pack
101
+
102
+ Geometric repacking ("git repack --geometric=<n>") in a repository
103
+ that borrows from an alternate object database had various corner
104
+ case bugs, which have been corrected.
105
106
Will merge to 'next'.
166
- source: <79497392-0296-2ae3-2560-1f90c1a309b5@web.de>
107
+ source: <cover.1681452028.git.ps@pks.im>
108
109
169
-* rs/remove-approxidate-relative (2023-04-10) 1 commit
170
- - date: remove approxidate_relative()
110
+* rj/send-email-validate-hook-count-messages (2023-04-14) 1 commit
111
+ - send-email: export patch counters in validate environment
112
172
- The approxidate() API has been simplified by losing an extra
173
- function that did the same thing as another one.
113
+ The sendemail-validate validate hook learned to pass the total
114
+ number of input files and where in the sequence each invocation is
115
+ via environment variables.
116
117
Will merge to 'next'.
176
- source: <f5b9a290-7cec-7a83-660b-e15494d2cdc8@web.de>
118
+ source: <20230414155249.667180-1-robin@jarry.cc>
119
120
179
-* rs/userdiff-multibyte-regex (2023-04-07) 1 commit
180
- - userdiff: support regexec(3) with multi-byte support
121
+* tb/pack-revindex-on-disk (2023-04-13) 7 commits
122
+ - t: invert `GIT_TEST_WRITE_REV_INDEX`
123
+ - config: enable `pack.writeReverseIndex` by default
124
+ - pack-revindex: introduce `pack.readReverseIndex`
125
+ - pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
126
+ - pack-revindex: make `load_pack_revindex` take a repository
127
+ - t5325: mark as leak-free
128
+ - pack-write.c: plug a leak in stage_tmp_packfiles()
129
182
- The userdiff regexp patterns for various filetypes that are built
183
- into the system have been updated to avoid triggering regexp errors
184
- from UTF-8 aware regex engines.
130
+ The on-disk reverse index that allows mapping from the pack offset
131
+ to the object name for the object stored at the offset has been
132
+ enabled by default.
133
186
- Will merge to 'next'.
187
- source: <7327ac06-d5da-ec53-543e-78e7729e78bb@web.de>
134
+ Will merge to 'next'?
135
+ source: <cover.1681338013.git.me@ttaylorr.com>
136
137
190
-* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
191
- - usage: clarify --recurse-submodules as a boolean
138
+* fc/doc-use-datestamp-in-commit (2023-04-14) 3 commits
139
+ - doc: set actual revdate for manpages
140
+ - Merge branch 'fc/doc-stop-using-manversion' into fc/doc-use-datestamp-in-commit
141
+ - Merge branch 'fc/remove-header-workarounds-for-asciidoc' into fc/doc-use-datestamp-in-commit
142
+ (this branch uses fc/doc-stop-using-manversion and fc/remove-header-workarounds-for-asciidoc.)
143
193
- The "--[no-]recurse-submodules" option of "git checkout" and others
194
- supported an undocumented syntax --recurse-submodules=<value> where
195
- the value can spell a Boolean in various ways. The support for the
196
- syntax is being dropped.
144
+ source: <20230413074722.71260-1-felipe.contreras@gmail.com>
145
198
- Comments?
199
- source: <ZDSTFwMFO7vbj/du@google.com>
146
147
+* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
148
+ - completion: complete AUTO_MERGE
149
+ - Documentation: document AUTO_MERGE
150
+ - git-merge.txt: modernize word choice in "True merge" section
151
+ - completion: complete REVERT_HEAD and BISECT_HEAD
152
+ - revisions.txt: document more special refs
153
202
-* gc/better-error-when-local-clone-fails-with-symlink (2023-04-11) 1 commit
203
- - clone: error specifically with --local and symlinked objects
154
+ source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
155
205
- "git clone --local" stops copying from an original repository that
206
- has symbolic links inside its $GIT_DIR; an error message when that
207
- happens has been updated.
156
209
- Will merge to 'next'.
210
- source: <pull.1488.v2.git.git.1681165130765.gitgitgadget@gmail.com>
157
+* tb/ban-strtok (2023-04-14) 5 commits
158
+ - banned.h: mark `strtok()`, `strtok_r()` as banned
159
+ - t/helper/test-json-writer.c: avoid using `strtok()`
160
+ - t/helper/test-oidmap.c: avoid using `strtok()`
161
+ - t/helper/test-hashmap.c: avoid using `strtok()`
162
+ - string-list: introduce `string_list_split_in_place_multi()`
163
+
164
+ source: <cover.1681428696.git.me@ttaylorr.com>
165
166
--------------------------------------------------
167
[Stalled]
168
215
-* ed/fsmonitor-inotify (2022-12-13) 6 commits
216
- - fsmonitor: update doc for Linux
217
- - fsmonitor: test updates
218
- - fsmonitor: enable fsmonitor for Linux
219
- - fsmonitor: implement filesystem change listener for Linux
220
- - fsmonitor: determine if filesystem is local or remote
221
- - fsmonitor: prepare to share code between Mac OS and Linux
222
-
223
- Bundled fsmonitor for Linux using inotify API.
224
-
225
- What's the status of this one?
226
- source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
227
-
228
-
169
* ja/worktree-orphan (2023-01-13) 4 commits
170
- worktree add: add hint to direct users towards --orphan
171
- worktree add: add --orphan flag
@@ -296,15 +236,104 @@ Release tarballs are available at:
236
--------------------------------------------------
237
[Cooking]
238
299
-* rj/sendemail-validate-series-hook (2023-04-05) 1 commit
300
- - hooks: add sendemail-validate-series
239
+* la/mfc-markup-fix (2023-04-06) 1 commit
240
+ (merged to 'next' on 2023-04-10 at 05415e1c90)
241
+ + MyFirstContribution: render literal *
242
302
- "git send-email" learns a new hook that takes the entire set of
303
- patch files from its standard input to validate them in one go,
304
- instead of getting called once per each file.
243
+ Documentation mark-up fix.
244
306
- Comments?
307
- source: <20230405231305.96996-1-robin@jarry.cc>
245
+ Will merge to 'master'.
246
+ source: <pull.1510.git.1680661709616.gitgitgadget@gmail.com>
247
+
248
+
249
+* ar/t2024-checkout-output-fix (2023-04-10) 1 commit
250
+ (merged to 'next' on 2023-04-13 at a35a043d6c)
251
+ + t2024: fix loose/strict local base branch DWIM test
252
+
253
+ Test fix.
254
+
255
+ Will merge to 'master'.
256
+ source: <20230408205450.569548-1-rybak.a.v@gmail.com>
257
+
258
+
259
+* fc/doc-stop-using-manversion (2023-04-10) 1 commit
260
+ (merged to 'next' on 2023-04-14 at 0800fe5ab4)
261
+ + doc: simplify man version
262
+ (this branch is used by fc/doc-use-datestamp-in-commit.)
263
+
264
+ Doc build simplification.
265
+
266
+ Will merge to 'master'.
267
+ source: <20230408001829.11031-1-felipe.contreras@gmail.com>
268
+
269
+
270
+* rn/sparse-diff-index (2023-04-10) 1 commit
271
+ - diff-index: enable sparse index
272
+
273
+ "git diff-index" command has been taught to work better with the
274
+ sparse index.
275
+
276
+ Expecting a reroll.
277
+ cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
278
+ source: <20230408112342.404318-1-nanth.raghul@gmail.com>
279
+
280
+
281
+* rs/get-tar-commit-id-use-defined-const (2023-04-10) 1 commit
282
+ (merged to 'next' on 2023-04-13 at ad62b4545a)
283
+ + get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
284
+
285
+ Code clean-up to replace a hardcoded constant with a CPP macro.
286
+
287
+ Will merge to 'master'.
288
+ source: <79497392-0296-2ae3-2560-1f90c1a309b5@web.de>
289
+
290
+
291
+* rs/remove-approxidate-relative (2023-04-10) 1 commit
292
+ (merged to 'next' on 2023-04-13 at bd7df5f98c)
293
+ + date: remove approxidate_relative()
294
+
295
+ The approxidate() API has been simplified by losing an extra
296
+ function that did the same thing as another one.
297
+
298
+ Will merge to 'master'.
299
+ source: <f5b9a290-7cec-7a83-660b-e15494d2cdc8@web.de>
300
+
301
+
302
+* rs/userdiff-multibyte-regex (2023-04-07) 1 commit
303
+ (merged to 'next' on 2023-04-13 at 348908c03c)
304
+ + userdiff: support regexec(3) with multi-byte support
305
+
306
+ The userdiff regexp patterns for various filetypes that are built
307
+ into the system have been updated to avoid triggering regexp errors
308
+ from UTF-8 aware regex engines.
309
+
310
+ Will merge to 'master'.
311
+ source: <7327ac06-d5da-ec53-543e-78e7729e78bb@web.de>
312
+
313
+
314
+* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
315
+ - usage: clarify --recurse-submodules as a boolean
316
+
317
+ The "--[no-]recurse-submodules" option of "git checkout" and others
318
+ supported an undocumented syntax --recurse-submodules=<value> where
319
+ the value can spell a Boolean in various ways. The support for the
320
+ syntax is being dropped.
321
+
322
+ Expecting a reroll.
323
+ cf. <ZDSTFwMFO7vbj/du@google.com>
324
+ source: <ZDSTFwMFO7vbj/du@google.com>
325
+
326
+
327
+* gc/better-error-when-local-clone-fails-with-symlink (2023-04-11) 1 commit
328
+ (merged to 'next' on 2023-04-13 at fff15efe05)
329
+ + clone: error specifically with --local and symlinked objects
330
+
331
+ "git clone --local" stops copying from an original repository that
332
+ has symbolic links inside its $GIT_DIR; an error message when that
333
+ happens has been updated.
334
+
335
+ Will merge to 'master'.
336
+ source: <pull.1488.v2.git.git.1681165130765.gitgitgadget@gmail.com>
337
338
339
* tk/mergetool-gui-default-config (2023-04-05) 1 commit
@@ -334,6 +363,7 @@ Release tarballs are available at:
363
* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit
364
(merged to 'next' on 2023-04-10 at f08eab44f2)
365
+ doc: asciidoc: remove custom header macro
366
+ (this branch is used by fc/doc-use-datestamp-in-commit.)
367
368
Doc toolchain update to remove old workaround for AsciiDoc.
369
@@ -341,30 +371,35 @@ Release tarballs are available at:
371
source: <20230323221523.52472-1-felipe.contreras@gmail.com>
372
373
344
-* ow/ref-filter-omit-empty (2023-04-07) 1 commit
345
- - branch, for-each-ref, tag: add option to omit empty lines
374
+* ow/ref-filter-omit-empty (2023-04-13) 1 commit
375
+ (merged to 'next' on 2023-04-14 at 2798986c60)
376
+ + branch, for-each-ref, tag: add option to omit empty lines
377
378
"git branch --format=..." and "git format-patch --format=..."
379
learns "--omit-empty" to hide refs that whose formatting result
380
becomes an empty string from the output.
381
351
- Will merge to 'next'?
382
+ Will merge to 'master'.
383
source: <20230407175316.6404-1-oystwa@gmail.com>
384
385
386
* rn/sparse-describe (2023-04-03) 1 commit
356
- - describe: enable sparse index for describe
387
+ (merged to 'next' on 2023-04-14 at 9699cfad2c)
388
+ + describe: enable sparse index for describe
389
390
"git describe --dirty" learns to work better with sparse-index.
391
360
- Will merge to 'next'?
392
+ Will merge to 'master'.
393
source: <20230403164749.246001-1-nanth.raghul@gmail.com>
394
395
396
* ah/format-patch-thread-doc (2023-04-03) 1 commit
365
- - format-patch: correct documentation of --thread without an argument
397
+ (merged to 'next' on 2023-04-14 at acf141a832)
398
+ + format-patch: correct documentation of --thread without an argument
399
400
Doc update.
401
+
402
+ Will merge to 'master'.
403
source: <20230403040724.642513-1-alexhenrie24@gmail.com>
404
405
@@ -378,39 +413,41 @@ Release tarballs are available at:
413
414
Test cleanup.
415
381
- Will merge to 'next'?
416
+ Expecting a reroll.
417
+ cf. <6d572a02-0e20-1cf6-db6c-7306ac912049@gmail.com>
418
source: <20230403223338.468025-1-rybak.a.v@gmail.com>
419
420
421
* en/header-split-cache-h (2023-04-11) 24 commits
386
- - mailmap, quote: move declarations of global vars to correct unit
387
- - treewide: reduce includes of cache.h in other headers
388
- - treewide: remove double forward declaration of read_in_full
389
- - cache.h: remove unnecessary includes
390
- - treewide: remove cache.h inclusion due to pager.h changes
391
- - pager.h: move declarations for pager.c functions from cache.h
392
- - treewide: remove cache.h inclusion due to editor.h changes
393
- - editor: move editor-related functions and declarations into common file
394
- - treewide: remove cache.h inclusion due to object.h changes
395
- - object.h: move some inline functions and defines from cache.h
396
- - treewide: remove cache.h inclusion due to object-file.h changes
397
- - object-file.h: move declarations for object-file.c functions from cache.h
398
- - treewide: remove cache.h inclusion due to git-zlib changes
399
- - git-zlib: move declarations for git-zlib functions from cache.h
400
- - treewide: remove cache.h inclusion due to object-name.h changes
401
- - object-name.h: move declarations for object-name.c functions from cache.h
402
- - treewide: remove unnecessary cache.h inclusion
403
- - treewide: be explicit about dependence on mem-pool.h
404
- - treewide: be explicit about dependence on oid-array.h
405
- - treewide: be explicit about dependence on pack-revindex.h
406
- - treewide: be explicit about dependence on convert.h
407
- - treewide: be explicit about dependence on advice.h
408
- - treewide: be explicit about dependence on trace.h & trace2.h
409
- - Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
422
+ (merged to 'next' on 2023-04-13 at b9afefff0b)
423
+ + mailmap, quote: move declarations of global vars to correct unit
424
+ + treewide: reduce includes of cache.h in other headers
425
+ + treewide: remove double forward declaration of read_in_full
426
+ + cache.h: remove unnecessary includes
427
+ + treewide: remove cache.h inclusion due to pager.h changes
428
+ + pager.h: move declarations for pager.c functions from cache.h
429
+ + treewide: remove cache.h inclusion due to editor.h changes
430
+ + editor: move editor-related functions and declarations into common file
431
+ + treewide: remove cache.h inclusion due to object.h changes
432
+ + object.h: move some inline functions and defines from cache.h
433
+ + treewide: remove cache.h inclusion due to object-file.h changes
434
+ + object-file.h: move declarations for object-file.c functions from cache.h
435
+ + treewide: remove cache.h inclusion due to git-zlib changes
436
+ + git-zlib: move declarations for git-zlib functions from cache.h
437
+ + treewide: remove cache.h inclusion due to object-name.h changes
438
+ + object-name.h: move declarations for object-name.c functions from cache.h
439
+ + treewide: remove unnecessary cache.h inclusion
440
+ + treewide: be explicit about dependence on mem-pool.h
441
+ + treewide: be explicit about dependence on oid-array.h
442
+ + treewide: be explicit about dependence on pack-revindex.h
443
+ + treewide: be explicit about dependence on convert.h
444
+ + treewide: be explicit about dependence on advice.h
445
+ + treewide: be explicit about dependence on trace.h & trace2.h
446
+ + Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
447
448
Header clean-up.
449
413
- Will merge to 'next'.
450
+ Will merge to 'master'.
451
source: <pull.1509.v3.git.1681182060.gitgitgadget@gmail.com>
452
453
@@ -476,10 +513,13 @@ Release tarballs are available at:
513
514
515
* rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit
479
- - archive: improve support for running in subdirectory
516
+ (merged to 'next' on 2023-04-14 at 950f9ed807)
517
+ + archive: improve support for running in subdirectory
518
519
"git archive" run from a subdirectory mishandled attributes and
520
paths outside the current directory.
521
+
522
+ Will merge to 'master'.
523
source: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@web.de>
524
525
@@ -549,38 +589,11 @@ Release tarballs are available at:
589
590
Teach "diff-files" not to expand sparse-index unless needed.
591
552
- Comments?
592
+ Expecting a reroll.
593
+ cf. <c382017a-8c65-24ba-5092-6b46428d8b9b@github.com>
594
source: <20230322161820.3609-1-cheskaqiqi@gmail.com>
595
596
556
-* my/wildmatch-cleanups (2023-02-27) 5 commits
557
- . wildmatch: more cleanups after killing uchar
558
- . wildmatch: use char instead of uchar
559
- . wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
560
- . wildmatch: remove IS*() macros
561
- . git-compat-util: add isblank() and isgraph()
562
-
563
- Code clean-up.
564
-
565
- Ejected as it conflicts with pw/wildmatch-fixes topic.
566
- source: <20230226115021.1681834-1-masahiroy@kernel.org>
567
-
568
-
569
-* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits
570
- . add: reject nested repositories
571
- . tests: remove duplicate .gitmodules path
572
- . tests: use `git submodule add` and fix expected status
573
- . tests: use `git submodule add` and fix expected diffs
574
- . tests: Use `git submodule add` instead of `git add`
575
- . t4041, t4060: modernize test style
576
-
577
- Forbid "git add dir" from adding a gitlink to the index.
578
-
579
- Comments?
580
- Seems to break tests when merged to 'seen'.
581
- source: <20230228185253.2356546-1-calvinwan@google.com>
582
-
583
-
597
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
598
- pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
599
@@ -605,7 +618,7 @@ Release tarballs are available at:
618
Error messages given when working on an unborn branch that is
619
checked out in another worktree have been improved.
620
608
- Kicked out of 'next' to replace with an updated version.
621
+ Will merge to 'next'?
622
source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
623
624
@@ -678,3 +691,58 @@ Release tarballs are available at:
691
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
692
cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
693
source: <20230302215237.1473444-1-calvinwan@google.com>
694
+
695
+--------------------------------------------------
696
+[Discarded]
697
+
698
+* ed/fsmonitor-inotify (2022-12-13) 6 commits
699
+ . fsmonitor: update doc for Linux
700
+ . fsmonitor: test updates
701
+ . fsmonitor: enable fsmonitor for Linux
702
+ . fsmonitor: implement filesystem change listener for Linux
703
+ . fsmonitor: determine if filesystem is local or remote
704
+ . fsmonitor: prepare to share code between Mac OS and Linux
705
+
706
+ Bundled fsmonitor for Linux using inotify API.
707
+
708
+ Seems to break asan job at CI when merged to 'seen'.
709
+ cf. <xmqqzg7d8xn2.fsf@gitster.g>
710
+ source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
711
+
712
+
713
+* rj/sendemail-validate-series-hook (2023-04-05) 1 commit
714
+ . hooks: add sendemail-validate-series
715
+
716
+ "git send-email" learns a new hook that takes the entire set of
717
+ patch files from its standard input to validate them in one go,
718
+ instead of getting called once per each file.
719
+
720
+ Superseded by the rj/send-email-validate-hook-count-messages topic.
721
+ source: <20230405231305.96996-1-robin@jarry.cc>
722
+
723
+
724
+* my/wildmatch-cleanups (2023-02-27) 5 commits
725
+ . wildmatch: more cleanups after killing uchar
726
+ . wildmatch: use char instead of uchar
727
+ . wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
728
+ . wildmatch: remove IS*() macros
729
+ . git-compat-util: add isblank() and isgraph()
730
+
731
+ Code clean-up.
732
+
733
+ Discarded without prejudice after more than 6 weeks of inactivity.
734
+ source: <20230226115021.1681834-1-masahiroy@kernel.org>
735
+
736
+
737
+* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits
738
+ . add: reject nested repositories
739
+ . tests: remove duplicate .gitmodules path
740
+ . tests: use `git submodule add` and fix expected status
741
+ . tests: use `git submodule add` and fix expected diffs
742
+ . tests: Use `git submodule add` instead of `git add`
743
+ . t4041, t4060: modernize test style
744
+
745
+ Forbid "git add dir" from adding a gitlink to the index.
746
+
747
+ Discarded without prejudice after more than 6 weeks of inactivity.
748
+ source: <20230228185253.2356546-1-calvinwan@google.com>