What's cooking (2022/10 #07)
Junio C Hamano committed
Oct 26, 2022 at 11:35 UTC
cb290473efbbc11bce6206fb9d213f4bdc88b995
1 file changed
+526
-312
whats-cooking.txt
+526
-312
@@ -1,9 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2022, #06; Wed, 19)
3
-X-master-at: 45c9f05c44b1cb6bd2d6cb95a22cf5e3d21d5b63
4
-X-next-at: 067f57bc4a4a1e57327341b80f3d3545eba4dbd2
2
+Subject: What's cooking in git.git (Oct 2022, #07; Wed, 26)
3
+X-master-at: c6de66bd952dbf9e155871be60e3eb5a0439dac9
4
+X-next-at: 7bbb16d38b18ad93d53518b845d432a38daad2ef
5
+Bcc: lwn@lwn.net, gitster@pobox.com
6
6
-What's cooking in git.git (Oct 2022, #06; Wed, 19)
7
+What's cooking in git.git (Oct 2022, #07; Wed, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,12 +14,31 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
14
considered "accepted" at all. A topic without enough support may be
15
discarded after a long period of no activity.
16
16
-Git 2.38.1 and friends that address a couple of CVE on maintenance
17
-tracks have been released and they are all merged up to the
18
-development branches.
19
-
20
-Some topics outside 'next' have been expecting updates for too long
21
-and we may want to discard them, unless they see some activities.
17
+The security releases are over, and we have enough accumulated fixes
18
+on the 'master' front, I've merged a handful of them to 'maint'. We
19
+may or may not have a 2.38.2 release before we conclude this cycle.
20
+We'll see what happens.
21
+
22
+Starting from next week (week #4---see https://tinyurl.com/gitCal),
23
+we'll try a mini "bus factor" exercise, where I will disappear from
24
+the list for a few weeks. Taylor agreed to volunteer as an interim
25
+maintainer and will take over the daily integration of the project
26
+in the meantime. The branches at https://github.com/git/git/
27
+repository will be updated to reflect the result of daily
28
+integration cycles by the interim maintainer during the exercise.
29
+
30
+Other repositories would not be (see below). Most importantly, the
31
+kernel.org one will be likely left stale. But the interim
32
+maintainer may choose to publish to other repositories and announce
33
+them on this list. One that may be handy to have is a repository as
34
+a replacement for https://github.com/gitster/git/ repository that
35
+hosts "broken out" topics.
36
+
37
+Around week #7, I'll come back and we will conclude the exercise.
38
+Note that the interim maintainer will really make decisions on what
39
+topics to accept and advance to 'next' and 'master' in these weeks,
40
+and I will accept these decisions when I come back and continue from
41
+there.
42
43
Copies of the source code to Git live in many repositories, and the
44
following is a list of the ones I push into or their mirrors. Some
@@ -51,107 +71,310 @@ Release tarballs are available at:
71
--------------------------------------------------
72
[Graduated to 'master']
73
54
-* ab/coding-guidelines-c99 (2022-10-11) 5 commits
55
- (merged to 'next' on 2022-10-13 at c6b2b74dfb)
56
- + CodingGuidelines: recommend against unportable C99 struct syntax
57
- + CodingGuidelines: mention C99 features we can't use
58
- + CodingGuidelines: allow declaring variables in for loops
59
- + CodingGuidelines: mention dynamic C99 initializer elements
60
- + CodingGuidelines: update for C99
74
+* ab/grep-simplify-extended-expression (2022-10-11) 1 commit
75
+ (merged to 'next' on 2022-10-13 at 07993f09bc)
76
+ + grep.c: remove "extended" in favor of "pattern_expression", fix segfault
77
+
78
+ Giving "--invert-grep" and "--all-match" without "--grep" to the
79
+ "git log" command resulted in an attempt to access grep pattern
80
+ expression structure that has not been allocated, which has been
81
+ corrected.
82
+ source: <patch-v2-1.1-6ad7627706f-20221011T094715Z-avarab@gmail.com>
83
+
84
62
- Update CodingGuidelines to clarify what features to use and avoid
63
- in C99.
64
- source: <20221010203800.2154698-1-gitster@pobox.com>
85
+* ab/macos-build-fix-with-sha1dc (2022-10-19) 1 commit
86
+ (merged to 'next' on 2022-10-19 at 408ce79f33)
87
+ + fsmonitor OSX: compile with DC_SHA1=YesPlease
88
89
+ Enable macOS build with sha1dc hash function.
90
+ source: <patch-v2-1.4-392fabdb456-20221019T010222Z-avarab@gmail.com>
91
67
-* jh/struct-zero-init-with-older-clang (2022-10-10) 1 commit
68
- (merged to 'next' on 2022-10-13 at 393abc3019)
69
- + config.mak.dev: disable suggest braces error on old clang versions
92
71
- Work around older clang that warns against C99 zero initialization
72
- syntax for struct.
73
- source: <pull.1375.v2.git.1665416340806.gitgitgadget@gmail.com>
93
+* ds/cmd-main-reorder (2022-10-08) 1 commit
94
+ (merged to 'next' on 2022-10-14 at d7f07dbecf)
95
+ + git.c: improve code readability in cmd_main()
96
97
+ Code clean-up.
98
+ source: <pull.1355.v3.git.git.1665246097190.gitgitgadget@gmail.com>
99
76
-* rs/archive-dedup-printf (2022-10-11) 1 commit
77
- (merged to 'next' on 2022-10-13 at af770cf00f)
78
- + archive: deduplicate verbose printing
100
80
- Code simplification.
81
- source: <af5611aa-8662-7508-4f00-7fcf4e9cbcc6@web.de>
101
+* gc/bare-repo-discovery (2022-10-13) 1 commit
102
+ (merged to 'next' on 2022-10-17 at 3de2be7c14)
103
+ + config: respect includes in protected config
104
+
105
+ Allow configuration files in "protected" scopes to include other
106
+ configuration files.
107
+ source: <pull.1360.v2.git.git.1665683027912.gitgitgadget@gmail.com>
108
+
109
+
110
+* jc/ci-osx-with-sha1dc (2022-10-20) 1 commit
111
+ (merged to 'next' on 2022-10-21 at 2d3312dfb9)
112
+ + ci: use DC_SHA1=YesPlease on osx-clang job for CI
113
+
114
+ Give a bit more diversity to macOS CI by using sha1dc in one of the
115
+ jobs (the other one tests Apple Common Crypto).
116
+ source: <xmqq35bitooc.fsf@gitster.g>
117
+
118
+
119
+* jc/more-sanitizer-at-ci (2022-10-20) 1 commit
120
+ (merged to 'next' on 2022-10-21 at 91ec913532)
121
+ + ci: add address and undefined sanitizer tasks
122
+
123
+ Enable address and undefined sanitizer tasks at GitHub Actions CI.
124
+ source: <xmqqpmezxl9p.fsf@gitster.g>
125
+
126
+
127
+* jc/symbolic-ref-no-recurse (2022-10-09) 1 commit
128
+ (merged to 'next' on 2022-10-13 at 532a3f6a5f)
129
+ + symbolic-ref: teach "--[no-]recurse" option
130
+
131
+ After checking out a "branch" that is a symbolic-ref that points at
132
+ another branch, "git symbolic-ref HEAD" reports the underlying
133
+ branch, not the symbolic-ref the user gave checkout as argument.
134
+ The command learned the "--no-recurse" option to stop after
135
+ dereferencing a symbolic-ref only once.
136
+ source: <xmqqleprcn08.fsf@gitster.g>
137
+
138
+
139
+* jk/use-o0-in-leak-sanitizer (2022-10-19) 1 commit
140
+ (merged to 'next' on 2022-10-19 at 27c2546b98)
141
+ + Makefile: force -O0 when compiling with SANITIZE=leak
142
+
143
+ Avoid false-positive from LSan whose assumption may be broken with
144
+ higher optimization levels.
145
+ source: <Y08JZVDgJpJvrBiz@coredump.intra.peff.net>
146
+
147
+
148
+* rj/branch-edit-description-with-nth-checkout (2022-10-10) 1 commit
149
+ (merged to 'next' on 2022-10-14 at 90850a2211)
150
+ + branch: support for shortcuts like @{-1}, completed
151
+
152
+ "git branch --edit-description @{-1}" is now a way to edit branch
153
+ description of the branch you were on before switching to the
154
+ current branch.
155
+ source: <fbf84e26-4306-c8df-0e2c-45dc94129e3a@gmail.com>
156
+
157
+
158
+* rs/diff-caret-bang-with-parents (2022-10-01) 3 commits
159
+ (merged to 'next' on 2022-10-17 at 24609eb777)
160
+ + diff: support ^! for merges
161
+ + revisions.txt: unspecify order of resolved parts of ^!
162
+ + revision: use strtol_i() for exclude_parent
163
+
164
+ "git diff rev^!" did not show combined diff to go to the rev from
165
+ its parents.
166
+ source: <16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de>
167
168
--------------------------------------------------
169
[New Topics]
170
86
-* jk/unused-anno-more (2022-10-17) 12 commits
87
- - ll-merge: mark unused parameters in callbacks
88
- - diffcore-pickaxe: mark unused parameters in pickaxe functions
89
- - convert: mark unused parameter in null stream filter
90
- - apply: mark unused parameters in noop error/warning routine
91
- - apply: mark unused parameters in handlers
92
- - date: mark unused parameters in handler functions
93
- - string-list: mark unused callback parameters
94
- - object-file: mark unused parameters in hash_unknown functions
95
- - mark unused parameters in trivial compat functions
96
- - update-index: drop unused argc from do_reupdate()
97
- - submodule--helper: drop unused argc from module_list_compute()
98
- - diffstat_consume(): assert non-zero length
171
+* tb/shortlog-group (2022-10-24) 7 commits
172
+ (merged to 'next' on 2022-10-25 at 0d1b797119)
173
+ + shortlog: implement `--group=committer` in terms of `--group=<format>`
174
+ + shortlog: implement `--group=author` in terms of `--group=<format>`
175
+ + shortlog: extract `shortlog_finish_setup()`
176
+ + shortlog: support arbitrary commit format `--group`s
177
+ + shortlog: extract `--group` fragment for translation
178
+ + shortlog: make trailer insertion a noop when appropriate
179
+ + shortlog: accept `--date`-related options
180
100
- More UNUSED annotation to help using -Wunused option with the
101
- compiler.
181
+ "git shortlog" learned to group by the "format" string.
182
+
183
+ Will merge to 'master'.
184
+ source: <cover.1666637725.git.me@ttaylorr.com>
185
+
186
+
187
+* pw/config-int-parse-fixes (2022-10-22) 3 commits
188
+ - git_parse_signed(): avoid integer overflow
189
+ - config: require at least one digit when parsing numbers
190
+ - git_parse_unsigned: reject negative values
191
+
192
+ Assorted fixes of parsing end-user input as integers.
193
+
194
+ Expecting a reroll to add test coverage.
195
+ cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
196
+ source: <pull.1389.git.1666359915.gitgitgadget@gmail.com>
197
+
198
+
199
+* sa/cat-file-mailmap (2022-10-21) 1 commit
200
+ - doc/cat-file: allow --use-mailmap for --batch options
201
+
202
+ Doc updates.
203
+
204
+ Waiting for review response.
205
+ source: <20221021103442.202759-1-siddharthasthana31@gmail.com>
206
+
207
+
208
+* sg/stable-docdep (2022-10-21) 1 commit
209
+ (merged to 'next' on 2022-10-25 at 83ecf487f3)
210
+ + Documentation/build-docdep.perl: generate sorted output
211
+
212
+ Make sure generated dependency file is stably sorted to help
213
+ developers debugging their build issues.
214
+
215
+ Will merge to 'master'.
216
+ source: <20221021102950.539148-1-szeder.dev@gmail.com>
217
+
218
+
219
+* pb/subtree-split-and-merge-after-squashing-tag-fix (2022-10-21) 9 commits
220
+ - subtree: fix split after annotated tag was squashed merged
221
+ - subtree: fix squash merging after annotated tag was squashed merged
222
+ - subtree: process 'git-subtree-split' trailer in separate function
223
+ - subtree: use named variables instead of "$@" in cmd_pull
224
+ - subtree: define a variable before its first use in 'find_latest_squash'
225
+ - subtree: prefix die messages with 'fatal'
226
+ - subtree: add 'die_incompatible_opt' function to reduce duplication
227
+ - subtree: use 'git rev-parse --verify [--quiet]' for better error messages
228
+ - test-lib-functions: mark 'test_commit' variables as 'local'
229
+
230
+ A bugfix to "git subtree" in its split and merge features.
231
232
Will merge to 'next'.
104
- source: <Y036whEorZV0rOgB@coredump.intra.peff.net>
233
+ source: <pull.1390.git.1666365219.gitgitgadget@gmail.com>
234
235
107
-* tb/save-keep-pack-during-geometric-repack (2022-10-17) 1 commit
108
- - repack: don't remove .keep packs with `--pack-kept-objects`
236
+* jk/repack-tempfile-cleanup (2022-10-23) 6 commits
237
+ (merged to 'next' on 2022-10-25 at 7e2d2f45d3)
238
+ + t7700: annotate cruft-pack failure with ok=sigpipe
239
+ + repack: drop remove_temporary_files()
240
+ + repack: use tempfiles for signal cleanup
241
+ + repack: expand error message for missing pack files
242
+ + repack: populate extension bits incrementally
243
+ + repack: convert "names" util bitfield to array
244
110
- When geometric repacking feature is in use together with the
111
- --pack-kept-objects option, we lost packs marked with .keep files.
245
+ The way "git repack" creared temporary files when it received a
246
+ signal was prone to deadlocking, which has been corrected.
247
+
248
+ Will merge to 'master'.
249
+ source: <Y1M3fVnixJHvKiSg@coredump.intra.peff.net>
250
+
251
+
252
+* en/ort-dir-rename-and-symlink-fix (2022-10-22) 1 commit
253
+ - merge-ort: fix bug with dir rename vs change dir to symlink
254
+
255
+ Merging a branch with directory renames into a branch that changes
256
+ the directory to a symlink was mishandled by the ort merge
257
+ strategy, which has been corrected.
258
259
Will merge to 'next'.
114
- source: <6a012cd625c1d197ede91c85299cbfb37adf356b.1666059872.git.me@ttaylorr.com>
260
+ source: <pull.1391.git.1666465450590.gitgitgadget@gmail.com>
261
262
117
-* mm/git-pm-try-catch-syntax-fix (2022-10-17) 1 commit
118
- - Git.pm: add semicolon after catch statement
263
+* en/merge-tree-sequence (2022-10-22) 2 commits
264
+ - merge-tree: support multiple batched merges with --stdin
265
+ - merge-tree: update documentation for differences in -z output
266
120
- Fix a longstanding syntax error in Git.pm error codepath.
267
+ "git merge-tree --stdin" is a new way to request a series of merges
268
+ and report the merge results.
269
122
- Will merge to 'next'??
123
- source: <20221016212236.12453-2-michael@mcclimon.org>
270
+ Will merge to 'next'?
271
+ source: <pull.1361.git.1666488485.gitgitgadget@gmail.com>
272
273
126
-* ab/macos-build-fix-with-sha1dc (2022-10-19) 1 commit
127
- (merged to 'next' on 2022-10-19 at 408ce79f33)
128
- + fsmonitor OSX: compile with DC_SHA1=YesPlease
274
+* rs/absorb-git-dir-simplify (2022-10-23) 1 commit
275
+ (merged to 'next' on 2022-10-25 at a5d6bc6667)
276
+ + submodule: use strvec_pushf() for --super-prefix
277
130
- Enable macOS build with sha1dc hash function.
278
+ Code simplification by using strvec_pushf() instead of building an
279
+ argument in a separate strbuf.
280
281
Will merge to 'master'.
133
- source: <patch-v2-1.4-392fabdb456-20221019T010222Z-avarab@gmail.com>
282
+ source: <7a4e2fc6-3e01-5683-2be5-13b7e67c7fe5@web.de>
283
284
136
-* jk/use-o0-in-leak-sanitizer (2022-10-19) 1 commit
137
- (merged to 'next' on 2022-10-19 at 27c2546b98)
138
- + Makefile: force -O0 when compiling with SANITIZE=leak
285
+* jc/doc-fsck-msgids (2022-10-25) 4 commits
286
+ - Documentation: add lint-fsck-msgids
287
+ - fsck: document msg-id
288
+ - fsck: remove the unused MISSING_TREE_OBJECT
289
+ - fsck: remove the unused BAD_TAG_OBJECT
290
140
- Avoid false-positive from LSan whose assumption may be broken with
141
- higher optimization levels.
291
+ Add documentation for message IDs in fsck error messages.
292
143
- Will merge to 'master'.
144
- source: <Y08JZVDgJpJvrBiz@coredump.intra.peff.net>
293
+ Will merge to 'next'?
294
+ source: <20221025224224.2352979-1-gitster@pobox.com>
295
296
147
-* jr/embargoed-releases-doc (2022-10-19) 1 commit
148
- - embargoed releases: also describe the git-security list and the process
297
+* tb/repack-expire-to (2022-10-24) 4 commits
298
+ - builtin/repack.c: implement `--expire-to` for storing pruned objects
299
+ - builtin/repack.c: write cruft packs to arbitrary locations
300
+ - builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
301
+ - builtin/repack.c: pass "out" to `prepare_pack_objects`
302
150
- The role the security mailing list plays in an embargoed release
151
- has been documented.
303
+ "git repack" learns to send cruft objects out of the way into
304
+ packfiles outside the repository.
305
306
Will merge to 'next'?
154
- source: <pull.1345.v2.git.1666142160427.gitgitgadget@gmail.com>
307
+ source: <cover.1666636974.git.me@ttaylorr.com>
308
+
309
+
310
+* cc/filtered-repack (2022-10-25) 2 commits
311
+ - repack: add --filter=<filter-spec> option
312
+ - pack-objects: allow --filter without --stdout
313
+
314
+ "git repack" learns to discard objects that ought to be retrievable
315
+ again from the promissor remote.
316
+
317
+ Needs review.
318
+ source: <20221025122856.20204-1-christian.couder@gmail.com>
319
+
320
+
321
+* tb/cap-patch-at-1gb (2022-10-25) 1 commit
322
+ - apply: reject patches larger than ~1 GiB
323
+
324
+ "git apply" limits its input to a bit less than 1 GiB.
325
+
326
+ Will merge to 'next'.
327
+ source: <70f5763834dff373a5573a99ec4cdfa36cadf34c.1666722251.git.me@ttaylorr.com>
328
+
329
+
330
+* tb/midx-cleanup-fix (2022-10-25) 1 commit
331
+ - midx.c: clear auxiliary MIDX files first
332
+
333
+ The order in which multi-pack-index and its associated files are
334
+ dropped has been tweaked to make it safer for concurrent users.
335
+
336
+ Under discussion, but leaning to negative..
337
+ cf. <143a588a-c98b-733b-2b23-34a87ca89431@github.com>
338
+ source: <bf36093cd6d7ac83b16241b0199b3a8c904e6774.1666722316.git.me@ttaylorr.com>
339
+
340
+
341
+* al/trace2-clearing-skip-worktree (2022-10-25) 1 commit
342
+ - index: add trace2 region for clear skip worktree
343
+
344
+ Add trace2 counters to the region to clear skip worktree bits in a
345
+ sparse checkout.
346
+
347
+ Needs review.
348
+ source: <pull.1368.git.git.1666742722502.gitgitgadget@gmail.com>
349
+
350
+
351
+* jt/skipping-negotiator-wo-recursion (2022-10-25) 1 commit
352
+ - negotiator/skipping: avoid stack overflow
353
+
354
+ Rewrite a deep recursion in the skipping negotiator to use a loop
355
+ with on-heap prio queue to avoid stack wastage.
356
+
357
+ Will merge to 'next'?
358
+ source: <20221025232934.1504445-1-jonathantanmy@google.com>
359
+
360
+
361
+* rj/branch-copy-rename-error-codepath-cleanup (2022-10-25) 1 commit
362
+ - branch: error copying or renaming a detached HEAD
363
+
364
+ Code simplification.
365
+
366
+ Will merge to 'next'.
367
+ source: <0ac8cd48-08d7-9bdd-b074-c8d5ded522f6@gmail.com>
368
+
369
+
370
+* rj/branch-do-not-exit-with-minus-one-status (2022-10-25) 1 commit
371
+ - branch: error code with --edit-description
372
+
373
+ "git branch --edit-description" can exit with status -1 which is
374
+ not a good practice; it learned to use 1 as everybody else instead.
375
+
376
+ Will merge to 'next'.
377
+ source: <b0f96b35-4e69-a889-bcdf-e0b40b89384f@gmail.com>
378
379
--------------------------------------------------
380
[Stalled]
@@ -180,78 +403,33 @@ Release tarballs are available at:
403
source: <20220809185429.20098-1-alban.gruin@gmail.com>
404
405
183
-* po/glossary-around-traversal (2022-07-09) 3 commits
184
- - glossary: add reachability bitmap description
185
- - glossary: add commit graph description
186
- - glossary: add Object DataBase (ODB) abbreviation
187
-
188
- The glossary entries for "commit-graph file" and "reachability
189
- bitmap" have been added.
190
-
191
- Expecting a reroll.
192
- cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>
193
- source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
194
-
195
-
196
-* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
197
- - clone, submodule update: check out branches
198
- - submodule--helper: refactor up-to-date criterion
406
+* gc/submodule-clone-update-with-branches (2022-10-20) 7 commits
407
+ - clone, submodule update: create and check out branches
408
+ - submodule update: refactor update targets
409
- submodule: return target of submodule symref
410
- t5617: drop references to remote-tracking branches
411
+ - submodule--helper clone: create named branch
412
- repo-settings: add submodule_propagate_branches
413
- clone: teach --detach option
414
415
"git clone --recurse-submodules" and "git submodule update" learns
416
to honor the "propagete branches" option.
206
-
207
- Expecting a reroll.
208
- cf. <20220901200047.515294-1-jonathantanmy@google.com> and others
209
- source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
417
+ source: <pull.1321.v2.git.git.1666297238.gitgitgadget@gmail.com>
418
419
212
-* tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit
213
- - diff.c: use utf8_strwidth() to count display width
420
+* tb/diffstat-with-utf8-strwidth (2022-10-21) 2 commits
421
+ (merged to 'next' on 2022-10-23 at 43a17bfeac)
422
+ + diff: leave NEEDWORK notes in show_stats() function
423
+ + diff.c: use utf8_strwidth() to count display width
424
425
"git diff --stat" etc. were invented back when everything was ASCII
426
and strlen() was a way to measure the display width of a string;
427
adjust them to compute the display width assuming UTF-8 pathnames.
428
219
- Expecting a reroll.
429
+ Will merge to 'master'.
430
source: <20220914151333.3309-1-tboegi@web.de>
431
432
223
-* mj/credential-helper-auth-headers (2022-09-13) 8 commits
224
- - http: set specific auth scheme depending on credential
225
- - http: move proactive auth to first slot creation
226
- - http: store all request headers on active_request_slot
227
- - credential: add WWW-Authenticate header to cred requests
228
- - http: read HTTP WWW-Authenticate response headers
229
- - osxkeychain: clarify that we ignore unknown lines
230
- - netrc: ignore unknown lines (do not die)
231
- - wincred: ignore unknown lines (do not die)
232
-
233
- Extending credential helper protocol.
234
-
235
- Expecting a reroll.
236
- A separate non-RFC submission of the first three is expected.
237
- cf. <AS8PR03MB86897FAC3E1E4F03D4420644C04F9@AS8PR03MB8689.eurprd03.prod.outlook.com>
238
- source: <pull.1352.git.1663097156.gitgitgadget@gmail.com>
239
-
240
-
241
-* cw/submodule-status-in-parallel (2022-09-23) 4 commits
242
- . diff-lib: parallelize run_diff_files for submodules
243
- . diff-lib: refactor functions
244
- . submodule: move status parsing into function
245
- . run-command: add pipe_output to run_processes_parallel
246
-
247
- Allow the internal "diff-files" engine to run "how has this
248
- submodule changed?" in parallel to speed up "git status".
249
-
250
- Breaks its self check.
251
- cf. https://github.com/git/git/actions/runs/3115673002/jobs/5052804463
252
- source: <20220922232947.631309-1-calvinwan@google.com>
253
-
254
-
433
* es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits
434
- config: let feature.experimental imply gc.cruftPacks=true
435
- gc: add tests for --cruft and friends
@@ -294,108 +472,210 @@ Release tarballs are available at:
472
--------------------------------------------------
473
[Cooking]
474
297
-* js/cmake-updates (2022-10-19) 5 commits
298
- - cmake: increase time-out for a long-running test
299
- - cmake: avoid editing t/test-lib.sh
300
- - add -p: avoid ambiguous signed/unsigned comparison
301
- - cmake: copy the merge tools for testing
302
- - cmake: make it easier to diagnose regressions in CTest runs
475
+* po/glossary-around-traversal (2022-10-22) 3 commits
476
+ - glossary: add reachability bitmap description
477
+ - glossary: add "commit graph" description
478
+ - doc: use 'object database' not ODB or abbreviation
479
304
- Update to build procedure with VS using CMake/CTest.
480
+ The glossary entries for "commit-graph file" and "reachability
481
+ bitmap" have been added.
482
306
- Will merge to 'next'?
307
- source: <pull.1320.v3.git.1666090745.gitgitgadget@gmail.com>
483
+ Expecting a (hopefully final) reroll.
484
+ cf. <746491f4-fb41-92fe-7360-20a845dc21fc@iee.email>
485
+ source: <20221022222539.2333-1-philipoakley@iee.email>
486
487
310
-* gc/bare-repo-discovery (2022-10-13) 1 commit
311
- (merged to 'next' on 2022-10-17 at 3de2be7c14)
312
- + config: respect includes in protected config
488
+* mc/credential-helper-auth-headers (2022-10-21) 6 commits
489
+ - t5556-http-auth: add test for HTTP auth hdr logic
490
+ - http: set specific auth scheme depending on credential
491
+ - http: move proactive auth to first slot creation
492
+ - http: store all request headers on active_request_slot
493
+ - credential: add WWW-Authenticate header to cred requests
494
+ - http: read HTTP WWW-Authenticate response headers
495
314
- Allow configuration files in "protected" scopes to include other
315
- configuration files.
496
+ Extending credential helper protocol.
497
+
498
+ Needs review.
499
+ source: <pull.1352.v2.git.1666372083.gitgitgadget@gmail.com>
500
+
501
+
502
+* cw/submodule-status-in-parallel (2022-10-20) 7 commits
503
+ . diff-lib: parallelize run_diff_files for submodules
504
+ . diff-lib: refactor match_stat_with_submodule
505
+ . submodule: move status parsing into function
506
+ . submodule: strbuf variable rename
507
+ . run-command: add hide_output to run_processes_parallel_opts
508
+ . run-command: add pipe_output_fn to run_processes_parallel_opts
509
+ . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
510
+ (this branch uses ab/run-hook-api-cleanup.)
511
+
512
+ Allow the internal "diff-files" engine to run "how has this
513
+ submodule changed?" in parallel to speed up "git status".
514
+
515
+ Breaks winVS test?
516
+ cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092>
517
+ source: <20221011232604.839941-1-calvinwan@google.com>
518
+
519
+
520
+* jk/unused-anno-more (2022-10-17) 12 commits
521
+ (merged to 'next' on 2022-10-20 at 0e52ab6cf9)
522
+ + ll-merge: mark unused parameters in callbacks
523
+ + diffcore-pickaxe: mark unused parameters in pickaxe functions
524
+ + convert: mark unused parameter in null stream filter
525
+ + apply: mark unused parameters in noop error/warning routine
526
+ + apply: mark unused parameters in handlers
527
+ + date: mark unused parameters in handler functions
528
+ + string-list: mark unused callback parameters
529
+ + object-file: mark unused parameters in hash_unknown functions
530
+ + mark unused parameters in trivial compat functions
531
+ + update-index: drop unused argc from do_reupdate()
532
+ + submodule--helper: drop unused argc from module_list_compute()
533
+ + diffstat_consume(): assert non-zero length
534
+
535
+ More UNUSED annotation to help using -Wunused option with the
536
+ compiler.
537
538
Will merge to 'master'.
318
- source: <pull.1360.v2.git.git.1665683027912.gitgitgadget@gmail.com>
539
+ source: <Y036whEorZV0rOgB@coredump.intra.peff.net>
540
541
321
-* jh/trace2-timers-and-counters (2022-10-13) 7 commits
322
- - trace2: add global counter mechanism
323
- - trace2: add stopwatch timers
324
- - trace2: convert ctx.thread_name from strbuf to pointer
325
- - trace2: rename the thread_name argument to trace2_thread_start
326
- - api-trace2.txt: elminate section describing the public trace2 API
327
- - tr2tls: clarify TLS terminology
328
- - trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
542
+* tb/save-keep-pack-during-geometric-repack (2022-10-17) 1 commit
543
+ (merged to 'next' on 2022-10-20 at c88c17eb52)
544
+ + repack: don't remove .keep packs with `--pack-kept-objects`
545
+
546
+ When geometric repacking feature is in use together with the
547
+ --pack-kept-objects option, we lost packs marked with .keep files.
548
+
549
+ Will merge to 'master'.
550
+ source: <6a012cd625c1d197ede91c85299cbfb37adf356b.1666059872.git.me@ttaylorr.com>
551
+
552
+
553
+* mm/git-pm-try-catch-syntax-fix (2022-10-22) 2 commits
554
+ (merged to 'next' on 2022-10-23 at 011a23710f)
555
+ + Git.pm: trust rev-parse to find bare repositories
556
+ (merged to 'next' on 2022-10-21 at 7896738c3b)
557
+ + Git.pm: add semicolon after catch statement
558
+
559
+ Fix a longstanding syntax error in Git.pm error codepath.
560
+
561
+ Will merge to 'master'.
562
+ source: <20221016212236.12453-1-michael@mcclimon.org>
563
+ source: <Y1Rdtog/XQV0YLj0@coredump.intra.peff.net>
564
+
565
+
566
+* jr/embargoed-releases-doc (2022-10-24) 1 commit
567
+ - embargoed releases: also describe the git-security list and the process
568
+
569
+ The role the security mailing list plays in an embargoed release
570
+ has been documented.
571
+
572
+ Will merge to 'next'.
573
+ source: <pull.1345.v4.git.1666649239302.gitgitgadget@gmail.com>
574
+
575
+
576
+* js/cmake-updates (2022-10-19) 5 commits
577
+ (merged to 'next' on 2022-10-21 at 012ec675ba)
578
+ + cmake: increase time-out for a long-running test
579
+ + cmake: avoid editing t/test-lib.sh
580
+ + add -p: avoid ambiguous signed/unsigned comparison
581
+ + cmake: copy the merge tools for testing
582
+ + cmake: make it easier to diagnose regressions in CTest runs
583
+
584
+ Update to build procedure with VS using CMake/CTest.
585
+
586
+ Will merge to 'master'.
587
+ source: <pull.1320.v3.git.1666090745.gitgitgadget@gmail.com>
588
+
589
+
590
+* jh/trace2-timers-and-counters (2022-10-24) 8 commits
591
+ (merged to 'next' on 2022-10-25 at f8848f3e44)
592
+ + trace2: add global counter mechanism
593
+ + trace2: add stopwatch timers
594
+ + trace2: convert ctx.thread_name from strbuf to pointer
595
+ + trace2: improve thread-name documentation in the thread-context
596
+ + trace2: rename the thread_name argument to trace2_thread_start
597
+ + api-trace2.txt: elminate section describing the public trace2 API
598
+ + tr2tls: clarify TLS terminology
599
+ + trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
600
601
Two new facilities, "timer" and "counter", are introduced to the
602
trace2 API.
332
- source: <pull.1373.v2.git.1665600750.gitgitgadget@gmail.com>
603
+
604
+ Will merge to 'master'.
605
+ source: <pull.1373.v4.git.1666618868.gitgitgadget@gmail.com>
606
607
608
* tb/midx-bitmap-selection-fix (2022-10-13) 4 commits
336
- - pack-bitmap-write.c: instrument number of reused bitmaps
337
- - midx.c: instrument MIDX and bitmap generation with trace2 regions
338
- - midx.c: consider annotated tags during bitmap selection
339
- - midx.c: fix whitespace typo
609
+ (merged to 'next' on 2022-10-20 at b4d98bb5e4)
610
+ + pack-bitmap-write.c: instrument number of reused bitmaps
611
+ + midx.c: instrument MIDX and bitmap generation with trace2 regions
612
+ + midx.c: consider annotated tags during bitmap selection
613
+ + midx.c: fix whitespace typo
614
615
A bugfix with tracing support in midx codepath
616
343
- Will merge to 'next'.
617
+ Will merge to 'master'.
618
source: <cover.1665612094.git.me@ttaylorr.com>
619
620
621
* tb/remove-unused-pack-bitmap (2022-10-17) 1 commit
348
- - builtin/repack.c: remove redundant pack-based bitmaps
622
+ (merged to 'next' on 2022-10-21 at ebb68add44)
623
+ + builtin/repack.c: remove redundant pack-based bitmaps
624
625
When creating a multi-pack bitmap, remove per-pack bitmap files
626
unconditionally as they will never be consulted.
627
353
- Will merge to 'next'?
628
+ Will merge to 'master'.
629
source: <1e0ef7ee7ff5feb323c77e594cd65433fb1d99f7.1666061096.git.me@ttaylorr.com>
630
631
632
* nw/t1002-cleanup (2022-10-14) 1 commit
358
- - t1002: modernize outdated conditional
633
+ (merged to 'next' on 2022-10-20 at e6ae742fef)
634
+ + t1002: modernize outdated conditional
635
636
Code clean-up in test.
637
362
- Will merge to 'next'.
638
+ Will merge to 'master'.
639
source: <pull.1362.v3.git.git.1665734502591.gitgitgadget@gmail.com>
640
641
366
-* zh/patch-id (2022-10-14) 7 commits
367
- - documentation: format-patch: clarify requirements for patch-ids to match
368
- - builtin: patch-id: remove unused diff-tree prefix
369
- - builtin: patch-id: add --include-whitespace as a command mode
370
- - patch-id: fix patch-id for mode changes
371
- - builtin: patch-id: fix patch-id with binary diffs
372
- - patch-id: use stable patch-id for rebases
373
- - patch-id: fix stable patch id for binary / header-only
642
+* jz/patch-id (2022-10-24) 6 commits
643
+ (merged to 'next' on 2022-10-24 at 1ac3b46fbe)
644
+ + builtin: patch-id: remove unused diff-tree prefix
645
+ + builtin: patch-id: add --verbatim as a command mode
646
+ + patch-id: fix patch-id for mode changes
647
+ + builtin: patch-id: fix patch-id with binary diffs
648
+ + patch-id: use stable patch-id for rebases
649
+ + patch-id: fix stable patch id for binary / header-only
650
651
A new "--include-whitespace" option is added to "git patch-id", and
652
existing bugs in the internal patch-id logic that did not match
653
what "git patch-id" produces have been corrected.
654
379
- Will merge to 'next'?
380
- source: <pull.1359.v3.git.1665737804.gitgitgadget@gmail.com>
655
+ Will merge to 'master'.
656
+ source: <pull.1359.v5.git.1666642064.gitgitgadget@gmail.com>
657
658
659
* hl/archive-recursive (2022-10-19) 10 commits
384
- - fixup! archive: add tests for git archive --recurse-submodules
385
- - archive: add tests for git archive --recurse-submodules
386
- - archive: add --recurse-submodules to git-archive command
387
- - archive: remove global repository from archive_args
388
- - archive: pass repo objects to write_archive handlers
389
- - tree: add repository parameter to read_tree_fn_t
390
- - tree: handle submodule case for read_tree_at properly
391
- - tree: increase test coverage for tree.c
392
- - tree: update cases to use repo_ tree methods
393
- - tree: do not use the_repository for tree traversal methods.
660
+ . fixup! archive: add tests for git archive --recurse-submodules
661
+ . archive: add tests for git archive --recurse-submodules
662
+ . archive: add --recurse-submodules to git-archive command
663
+ . archive: remove global repository from archive_args
664
+ . archive: pass repo objects to write_archive handlers
665
+ . tree: add repository parameter to read_tree_fn_t
666
+ . tree: handle submodule case for read_tree_at properly
667
+ . tree: increase test coverage for tree.c
668
+ . tree: update cases to use repo_ tree methods
669
+ . tree: do not use the_repository for tree traversal methods.
670
671
"git archive" has been taught "--recurse-submodules" option to
672
create a tarball that includes contents from submodules.
673
674
Expecting a reroll.
675
+ Seems to break win+VS test(8).
676
+ cf. https://github.com/git/git/actions/runs/3293333066 whose only
677
+ difference from https://github.com/git/git/actions/runs/3293553109
678
+ is the inclusion of this topic.
679
source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
680
681
@@ -417,23 +697,10 @@ Release tarballs are available at:
697
option now implies --reapply-cherry-picks and --no-fork-point
698
options.
699
420
- Will merge to 'next'??
700
+ Will merge to 'next'.
701
source: <pull.1323.v4.git.1666012665.gitgitgadget@gmail.com>
702
703
424
-* ab/grep-simplify-extended-expression (2022-10-11) 1 commit
425
- (merged to 'next' on 2022-10-13 at 07993f09bc)
426
- + grep.c: remove "extended" in favor of "pattern_expression", fix segfault
427
-
428
- Giving "--invert-grep" and "--all-match" without "--grep" to the
429
- "git log" command resulted in an attempt to access grep pattern
430
- expression structure that has not been allocated, which has been
431
- corrected.
432
-
433
- Will merge to 'master'.
434
- source: <patch-v2-1.1-6ad7627706f-20221011T094715Z-avarab@gmail.com>
435
-
436
-
704
* pw/rebase-reflog-fixes (2022-10-17) 9 commits
705
- rebase: cleanup action handling
706
- rebase --abort: improve reflog message
@@ -450,40 +717,16 @@ Release tarballs are available at:
717
reflog messages of "rebase --apply" to match "rebase --merge" with
718
the aim of making the reflog easier to parse.
719
453
- Will merge to 'next'??
720
+ Will merge to 'next'.
721
source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
722
723
724
* sd/doc-smtp-encryption (2022-10-12) 1 commit
458
- - docs: git-send-email: difference between ssl and tls smtp-encryption
459
-
460
- Expecting a reroll??
461
- cf. <19e5b678-6014-d783-347f-9169371aaa09@iee.email>
462
- source: <20221012150619.12877-1-sndanailov@wired4ever.net>
463
-
464
-
465
-* jc/symbolic-ref-no-recurse (2022-10-09) 1 commit
466
- (merged to 'next' on 2022-10-13 at 532a3f6a5f)
467
- + symbolic-ref: teach "--[no-]recurse" option
468
-
469
- After checking out a "branch" that is a symbolic-ref that points at
470
- another branch, "git symbolic-ref HEAD" reports the underlying
471
- branch, not the symbolic-ref the user gave checkout as argument.
472
- The command learned the "--no-recurse" option to stop after
473
- dereferencing a symbolic-ref only once.
725
+ (merged to 'next' on 2022-10-25 at d122052431)
726
+ + docs: git-send-email: difference between ssl and tls smtp-encryption
727
728
Will merge to 'master'.
476
- source: <xmqqleprcn08.fsf@gitster.g>
477
-
478
-
479
-* ds/cmd-main-reorder (2022-10-08) 1 commit
480
- (merged to 'next' on 2022-10-14 at d7f07dbecf)
481
- + git.c: improve code readability in cmd_main()
482
-
483
- Code clean-up.
484
-
485
- Will merge to 'master'.
486
- source: <pull.1355.v3.git.git.1665246097190.gitgitgadget@gmail.com>
729
+ source: <20221012150619.12877-1-sndanailov@wired4ever.net>
730
731
732
* ed/fsmonitor-inotify (2022-10-14) 7 commits
@@ -498,7 +741,6 @@ Release tarballs are available at:
741
Bundled fsmonitor for Linux using inotify API.
742
743
Needs review.
501
-
744
Occasional breakages of t7527.16?
745
source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
746
@@ -512,15 +754,6 @@ Release tarballs are available at:
754
source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>
755
756
515
-* jc/more-sanitizer-at-ci (2022-10-11) 1 commit
516
- . ci: add address and undefined sanitizer tasks
517
-
518
- Enable address and undefined sanitizer tasks at GitHub Actions CI.
519
-
520
- With this p4 tests seem to die with the server side going away.
521
- source: <xmqqpmezxl9p.fsf@gitster.g>
522
-
523
-
757
* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
758
. ci(main): linux32 uses actions/checkout@v2
759
. ci(main): upgrade actions/checkout to v3
@@ -533,26 +766,28 @@ Release tarballs are available at:
766
767
768
* ab/run-hook-api-cleanup (2022-10-12) 15 commits
536
- - run-command.c: remove "max_processes", add "const" to signal() handler
537
- - run-command.c: pass "opts" further down, and use "opts->processes"
538
- - run-command.c: use "opts->processes", not "pp->max_processes"
539
- - run-command.c: don't copy "data" to "struct parallel_processes"
540
- - run-command.c: don't copy "ungroup" to "struct parallel_processes"
541
- - run-command.c: don't copy *_fn to "struct parallel_processes"
542
- - run-command.c: make "struct parallel_processes" const if possible
543
- - run-command API: move *_tr2() users to "run_processes_parallel()"
544
- - run-command API: have run_process_parallel() take an "opts" struct
545
- - run-command.c: use designated init for pp_init(), add "const"
546
- - run-command API: don't fall back on online_cpus()
547
- - run-command API: make "n" parameter a "size_t"
548
- - run-command tests: use "return", not "exit"
549
- - run-command API: have "run_processes_parallel{,_tr2}()" return void
550
- - run-command test helper: use "else if" pattern
769
+ (merged to 'next' on 2022-10-20 at 29ca8c34dc)
770
+ + run-command.c: remove "max_processes", add "const" to signal() handler
771
+ + run-command.c: pass "opts" further down, and use "opts->processes"
772
+ + run-command.c: use "opts->processes", not "pp->max_processes"
773
+ + run-command.c: don't copy "data" to "struct parallel_processes"
774
+ + run-command.c: don't copy "ungroup" to "struct parallel_processes"
775
+ + run-command.c: don't copy *_fn to "struct parallel_processes"
776
+ + run-command.c: make "struct parallel_processes" const if possible
777
+ + run-command API: move *_tr2() users to "run_processes_parallel()"
778
+ + run-command API: have run_process_parallel() take an "opts" struct
779
+ + run-command.c: use designated init for pp_init(), add "const"
780
+ + run-command API: don't fall back on online_cpus()
781
+ + run-command API: make "n" parameter a "size_t"
782
+ + run-command tests: use "return", not "exit"
783
+ + run-command API: have "run_processes_parallel{,_tr2}()" return void
784
+ + run-command test helper: use "else if" pattern
785
+ (this branch is used by cw/submodule-status-in-parallel.)
786
787
Move a global variable added as a hack during regression fixes to
788
its proper place in the API.
789
555
- Will merge to 'next'.
790
+ Will merge to 'master'.
791
source: <cover-v3-00.15-00000000000-20221012T205712Z-avarab@gmail.com>
792
793
@@ -567,78 +802,55 @@ Release tarballs are available at:
802
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
803
804
570
-* rj/branch-edit-description-with-nth-checkout (2022-10-10) 1 commit
571
- (merged to 'next' on 2022-10-14 at 90850a2211)
572
- + branch: support for shortcuts like @{-1}, completed
573
-
574
- "git branch --edit-description @{-1}" is now a way to edit branch
575
- description of the branch you were on before switching to the
576
- current branch.
577
-
578
- Will merge to 'master'.
579
- source: <fbf84e26-4306-c8df-0e2c-45dc94129e3a@gmail.com>
580
-
581
-
582
-* rs/diff-caret-bang-with-parents (2022-10-01) 3 commits
583
- (merged to 'next' on 2022-10-17 at 24609eb777)
584
- + diff: support ^! for merges
585
- + revisions.txt: unspecify order of resolved parts of ^!
586
- + revision: use strtol_i() for exclude_parent
587
-
588
- "git diff rev^!" did not show combined diff to go to the rev from
589
- its parents.
590
-
591
- Will merge to 'master'.
592
- source: <16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de>
593
-
594
-
805
* ab/doc-synopsis-and-cmd-usage (2022-10-13) 34 commits
596
- - tests: assert consistent whitespace in -h output
597
- - tests: start asserting that *.txt SYNOPSIS matches -h output
598
- - doc txt & -h consistency: make "worktree" consistent
599
- - worktree: define subcommand -h in terms of command -h
600
- - reflog doc: list real subcommands up-front
601
- - doc txt & -h consistency: make "commit" consistent
602
- - doc txt & -h consistency: make "diff-tree" consistent
603
- - doc txt & -h consistency: use "[<label>...]" for "zero or more"
604
- - doc txt & -h consistency: make "annotate" consistent
605
- - doc txt & -h consistency: make "stash" consistent
606
- - doc txt & -h consistency: add missing options
607
- - doc txt & -h consistency: use "git foo" form, not "git-foo"
608
- - doc txt & -h consistency: make "bundle" consistent
609
- - doc txt & -h consistency: make "read-tree" consistent
610
- - doc txt & -h consistency: make "rerere" consistent
611
- - doc txt & -h consistency: add missing options and labels
612
- - doc txt & -h consistency: make output order consistent
613
- - doc txt & -h consistency: add or fix optional "--" syntax
614
- - doc txt & -h consistency: fix mismatching labels
615
- - doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
616
- - doc txt & -h consistency: use "<options>", not "<options>..."
617
- - stash doc SYNOPSIS & -h: correct padding around "[]()"
618
- - doc txt & -h consistency: correct padding around "[]()"
619
- - doc txt & -h consistency: balance unbalanced "[" and "]"
620
- - doc txt & -h consistency: add "-z" to cat-file "-h"
621
- - doc txt & -h consistency: fix incorrect alternates syntax
622
- - doc txt & -h consistency: word-wrap
623
- - built-ins: consistently add "\n" between "usage" and options
624
- - doc SYNOPSIS: consistently use ' for commands
625
- - doc SYNOPSIS: don't use ' for subcommands
626
- - bundle: define subcommand -h in terms of command -h
627
- - builtin/bundle.c: indent with tabs
628
- - CodingGuidelines: update and clarify command-line conventions
629
- - tests: assert *.txt SYNOPSIS and -h output
806
+ (merged to 'next' on 2022-10-21 at c6d632ac1a)
807
+ + tests: assert consistent whitespace in -h output
808
+ + tests: start asserting that *.txt SYNOPSIS matches -h output
809
+ + doc txt & -h consistency: make "worktree" consistent
810
+ + worktree: define subcommand -h in terms of command -h
811
+ + reflog doc: list real subcommands up-front
812
+ + doc txt & -h consistency: make "commit" consistent
813
+ + doc txt & -h consistency: make "diff-tree" consistent
814
+ + doc txt & -h consistency: use "[<label>...]" for "zero or more"
815
+ + doc txt & -h consistency: make "annotate" consistent
816
+ + doc txt & -h consistency: make "stash" consistent
817
+ + doc txt & -h consistency: add missing options
818
+ + doc txt & -h consistency: use "git foo" form, not "git-foo"
819
+ + doc txt & -h consistency: make "bundle" consistent
820
+ + doc txt & -h consistency: make "read-tree" consistent
821
+ + doc txt & -h consistency: make "rerere" consistent
822
+ + doc txt & -h consistency: add missing options and labels
823
+ + doc txt & -h consistency: make output order consistent
824
+ + doc txt & -h consistency: add or fix optional "--" syntax
825
+ + doc txt & -h consistency: fix mismatching labels
826
+ + doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
827
+ + doc txt & -h consistency: use "<options>", not "<options>..."
828
+ + stash doc SYNOPSIS & -h: correct padding around "[]()"
829
+ + doc txt & -h consistency: correct padding around "[]()"
830
+ + doc txt & -h consistency: balance unbalanced "[" and "]"
831
+ + doc txt & -h consistency: add "-z" to cat-file "-h"
832
+ + doc txt & -h consistency: fix incorrect alternates syntax
833
+ + doc txt & -h consistency: word-wrap
834
+ + built-ins: consistently add "\n" between "usage" and options
835
+ + doc SYNOPSIS: consistently use ' for commands
836
+ + doc SYNOPSIS: don't use ' for subcommands
837
+ + bundle: define subcommand -h in terms of command -h
838
+ + builtin/bundle.c: indent with tabs
839
+ + CodingGuidelines: update and clarify command-line conventions
840
+ + tests: assert *.txt SYNOPSIS and -h output
841
842
The short-help text shown by "git cmd -h" and the synopsis text
843
shown at the beginning of "git help cmd" have been made more
844
consistent.
845
635
- Will merge to 'next'?
846
+ Will merge to 'master'.
847
source: <cover-v5-00.34-00000000000-20221013T153625Z-avarab@gmail.com>
848
849
639
-* ab/coccicheck-incremental (2022-10-14) 11 commits
850
+* ab/coccicheck-incremental (2022-10-26) 12 commits
851
- spatchcache: add a ccache-alike for "spatch"
852
- cocci: run against a generated ALL.cocci
853
+ - cocci rules: remove <id>'s from rules that don't need them
854
- cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
855
- cocci: make "coccicheck" rule incremental
856
- cocci: split off "--all-includes" from SPATCH_FLAGS
@@ -653,7 +865,7 @@ Release tarballs are available at:
865
incrementally.
866
867
Will merge to 'next'?
656
- source: <cover-v3-00.11-00000000000-20221014T152552Z-avarab@gmail.com>
868
+ source: <cover-v4-00.12-00000000000-20221026T141005Z-avarab@gmail.com>
869
870
871
* ds/bundle-uri-3 (2022-10-12) 13 commits
@@ -674,6 +886,8 @@ Release tarballs are available at:
886
Define the logical elements of a "bundle list", data structure to
887
store them in-core, format to transfer them, and code to parse
888
them.
889
+
890
+ Will merge to 'next'?
891
source: <pull.1333.v5.git.1665579160.gitgitgadget@gmail.com>
892
893