What's cooking (2022/08 #10)
Junio C Hamano committed
Aug 30, 2022 at 11:27 UTC
35c208498c2b5bc3f216fa3af7643fe20724010a
1 file changed
+300
-277
whats-cooking.txt
+300
-277
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2022, #09; Fri, 26)
3
-X-master-at: 07ee72db0e97b5c233f8ada0abb412248c2f1c6f
4
-X-next-at: 80e7f50712d6a2d04807d40616c5c20b9e37eab9
2
+Subject: What's cooking in git.git (Aug 2022, #10; Tue, 30)
3
+X-master-at: d42b38dfb5edf1a7fddd9542d722f91038407819
4
+X-next-at: 179cf4a1993382e88ddca40c073b2b2f5899be0d
5
6
-What's cooking in git.git (Aug 2022, #09; Fri, 26)
6
+What's cooking in git.git (Aug 2022, #10; Tue, 30)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,9 +13,9 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
13
considered "accepted" at all. A topic without enough support may be
14
discarded after a long period of no activity.
15
16
-We are at the end of week #7 in a 12-week cycle toward Git 2.38
16
+We are in the middle of week #8 in a 12-week cycle toward Git 2.38
17
(tinyurl.com/gitCal). As we have accumulated enough material on
18
-the 'maint' branch, we may want to tag 2.37.3 early next week.
18
+the 'maint' branch, Git 2.37.3 has been tagged.
19
20
Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
@@ -46,96 +46,298 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
49
-[New Topics]
49
+[Graduated to 'master']
50
51
-* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
52
- - grep: fix multibyte regex handling under macOS
51
+* ad/preload-plug-memleak (2022-08-22) 1 commit
52
+ (merged to 'next' on 2022-08-24 at 1cad371f1c)
53
+ + preload-index: fix memleak
54
54
- With a bit of header twiddling, use the native regexp library on
55
- macOS instead of the compat/ one.
55
+ The preload-index codepath made copies of pathspec to give to
56
+ multiple threads, which were left leaked.
57
+ source: <20220822211507.8693-2-anthony.2lannoy@gmail.com>
58
57
- Needs review.
58
- source: <20220826085815.2771102-1-dds@aueb.gr>
59
+
60
+* ds/decorate-filter-tweak (2022-08-05) 11 commits
61
+ (merged to 'next' on 2022-08-19 at 064b9daa85)
62
+ + fetch: use ref_namespaces during prefetch
63
+ + maintenance: stop writing log.excludeDecoration
64
+ + log: create log.initialDecorationSet=all
65
+ + log: add --clear-decorations option
66
+ + log: add default decoration filter
67
+ + log-tree: use ref_namespaces instead of if/else-if
68
+ + refs: use ref_namespaces for replace refs base
69
+ + refs: add array of ref namespaces
70
+ + t4207: test coloring of grafted decorations
71
+ + t4207: modernize test
72
+ + refs: allow "HEAD" as decoration filter
73
+
74
+ The namespaces used by "log --decorate" from "refs/" hierarchy by
75
+ default has been tightened.
76
+ source: <pull.1301.v3.git.1659722323.gitgitgadget@gmail.com>
77
+
78
+
79
+* ds/github-actions-use-newer-ubuntu (2022-08-24) 1 commit
80
+ (merged to 'next' on 2022-08-24 at 55a76348b2)
81
+ + ci: update 'static-analysis' to Ubuntu 22.04
82
+
83
+ Update the version of Ubuntu used for GitHub Actions CI from 18.04
84
+ to 22.04.
85
+ source: <pull.1334.git.1661275691795.gitgitgadget@gmail.com>
86
+
87
+
88
+* en/ancestry-path-in-a-range (2022-08-19) 3 commits
89
+ (merged to 'next' on 2022-08-19 at 4fce3015b3)
90
+ + revision: allow --ancestry-path to take an argument
91
+ + t6019: modernize tests with helper
92
+ + rev-list-options.txt: fix simple typo
93
+
94
+ "git rev-list --ancestry-path=C A..B" is a natural extension of
95
+ "git rev-list A..B"; instead of choosing a subset of A..B to those
96
+ that have ancestry relationship with A, it lets a subset with
97
+ ancestry relationship with C.
98
+ source: <pull.1303.v3.git.1660883290.gitgitgadget@gmail.com>
99
+
100
+
101
+* en/ort-unused-code-removal (2022-08-19) 1 commit
102
+ (merged to 'next' on 2022-08-22 at f09dbeeca3)
103
+ + merge-ort: remove code obsoleted by other changes
104
+
105
+ Code clean-up.
106
+ source: <pull.1302.git.git.1660884355643.gitgitgadget@gmail.com>
107
+
108
+
109
+* es/fix-chained-tests (2022-08-24) 4 commits
110
+ (merged to 'next' on 2022-08-24 at 6266835a6e)
111
+ + t5329: notice a failure within a loop
112
+ (merged to 'next' on 2022-08-22 at 3774cfdaf4)
113
+ + t: detect and signal failure within loop
114
+ + t1092: fix buggy sparse "blame" test
115
+ + t2407: fix broken &&-chains in compound statement
116
+
117
+ Fix broken "&&-" chains and failures in early iterations of a loop.
118
+ source: <pull.1312.git.git.1661192802.gitgitgadget@gmail.com>
119
+
120
+
121
+* jd/prompt-show-conflict (2022-08-19) 1 commit
122
+ (merged to 'next' on 2022-08-19 at 83af487823)
123
+ + git-prompt: show presence of unresolved conflicts at command prompt
124
+
125
+ The bash prompt (in contrib/) learned to optionally indicate when
126
+ the index is unmerged.
127
+ source: <pull.1302.v3.git.1660695492382.gitgitgadget@gmail.com>
128
+
129
+
130
+* jk/unused-fixes (2022-08-20) 7 commits
131
+ (merged to 'next' on 2022-08-22 at 2fe4de2aed)
132
+ + xdiff: drop unused mmfile parameters from xdl_do_patience_diff()
133
+ + reflog: assert PARSE_OPT_NONEG in parse-options callbacks
134
+ + reftable: drop unused parameter from reader_seek_linear()
135
+ + verify_one_sparse(): drop unused parameters
136
+ + match_pathname(): drop unused "flags" parameter
137
+ + log-tree: drop unused commit param in remerge_diff()
138
+ + xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
139
+
140
+ Code clean-up to remove unused function parameters.
141
+ source: <Yv9Oay+tNqhLDqVl@coredump.intra.peff.net>
142
+ source: <YwCjOETsh1o8u0Og@coredump.intra.peff.net>
143
+
144
+
145
+* mg/sequencer-untranslate-reflog (2022-08-19) 3 commits
146
+ (merged to 'next' on 2022-08-22 at 75aadeb865)
147
+ + sequencer: do not translate command names
148
+ + sequencer: do not translate parameters to error_resolve_conflict()
149
+ + sequencer: do not translate reflog messages
150
+
151
+ The sequencer machinery translated messages left in the reflog by
152
+ mistake, which has been corrected.
153
+ source: <cover.1660828108.git.git@grubix.eu>
154
+
155
+
156
+* mt/rot13-in-c (2022-08-14) 4 commits
157
+ (merged to 'next' on 2022-08-19 at 22152a150c)
158
+ + tests: use the new C rot13-filter helper to avoid PERL prereq
159
+ + t0021: implementation the rot13-filter.pl script in C
160
+ + t0021: avoid grepping for a Perl-specific string at filter output
161
+ + Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
162
+
163
+ Test portability improvements.
164
+ source: <cover.1660522524.git.matheus.bernardino@usp.br>
165
+
166
+
167
+* sg/xcalloc-cocci-fix (2022-08-24) 1 commit
168
+ (merged to 'next' on 2022-08-24 at 84c05819d3)
169
+ + promisor-remote: fix xcalloc() argument order
170
+
171
+ xcalloc(), imitating calloc(), takes "number of elements of the
172
+ array", and "size of a single element", in this order. A call that
173
+ does not follow this ordering has been corrected.
174
+ source: <20220823095733.58685-1-szeder.dev@gmail.com>
175
+
176
+
177
+* tl/trace2-config-scope (2022-08-11) 2 commits
178
+ (merged to 'next' on 2022-08-22 at 75a09c7a34)
179
+ + tr2: shows scope unconditionally in addition to key-value pair
180
+ + api-trace2.txt: print config key-value pair
181
+
182
+ Tweak trace2 output about configuration variables.
183
+ source: <cover.1660272404.git.dyroneteng@gmail.com>
184
+
185
+
186
+* vd/fix-perf-tests (2022-08-19) 2 commits
187
+ (merged to 'next' on 2022-08-22 at e68356e624)
188
+ + p0006: fix 'read-tree' argument ordering
189
+ + p0004: fix prereq declaration
190
+
191
+ Rather trivial perf-test code fixes.
192
+ source: <pull.1330.git.1660942149.gitgitgadget@gmail.com>
193
+
194
+
195
+* vd/scalar-enables-fsmonitor (2022-08-18) 8 commits
196
+ (merged to 'next' on 2022-08-19 at 1e172e5647)
197
+ + scalar: update technical doc roadmap with FSMonitor support
198
+ + scalar unregister: stop FSMonitor daemon
199
+ + scalar: enable built-in FSMonitor on `register`
200
+ + scalar: move config setting logic into its own function
201
+ + scalar-delete: do not 'die()' in 'delete_enlistment()'
202
+ + scalar-[un]register: clearly indicate source of error
203
+ + scalar-unregister: handle error codes greater than 0
204
+ + scalar: constrain enlistment search
205
+
206
+ "scalar" now enables built-in fsmonitor on enlisted repositories,
207
+ when able.
208
+ source: <pull.1324.v3.git.1660858853.gitgitgadget@gmail.com>
209
210
--------------------------------------------------
61
-[Graduated to 'master']
211
+[New Topics]
212
+
213
+* rs/tempfile-cleanup-race-fix (2022-08-27) 1 commit
214
+ (merged to 'next' on 2022-08-30 at 158dd1c910)
215
+ + tempfile: avoid directory cleanup race
216
+
217
+ The clean-up of temporary files created via mks_tempfile_dt() was
218
+ racy and attempted to unlink() the leading directory when signals
219
+ are involved, which has been corrected.
220
+
221
+ Will merge to 'master'.
222
+ source: <526a174e-b179-c284-a21c-7afe0a0b4df2@web.de>
223
+
224
+
225
+* tb/diffstat-with-utf8-strwidth (2022-08-27) 1 commit
226
+ - diff.c: use utf8_strwidth() when appropriate
227
+
228
+ "git diff --stat" etc. were invented back when everything was ASCII
229
+ and strlen() was a way to measure the display width of a string;
230
+ adjust them to compute the display width assuming UTF-8 pathnames.
231
+ source: <20220827085007.20030-1-tboegi@web.de>
232
+
233
+
234
+* bc/gc-crontab-fix (2022-08-28) 1 commit
235
+ (merged to 'next' on 2022-08-30 at a7a240a4da)
236
+ + gc: use temporary file for editing crontab
237
+
238
+ FreeBSD portability fix for "git maintenance" that spawns "crontab"
239
+ to schedule tasks.
240
+
241
+ Will merge to 'master'.
242
+ source: <20220828214143.754759-1-sandals@crustytoothpaste.net>
243
63
-* cw/submodule-merge-messages (2022-08-04) 1 commit
64
- (merged to 'next' on 2022-08-12 at ede0890319)
65
- + submodule merge: update conflict error message
66
- (this branch is used by en/submodule-merge-messages-fixes.)
244
68
- Update the message given when "git merge" sees conflicts at a path
69
- with a submodule while merging a superproject.
70
- source: <20220804195105.1303455-1-calvinwan@google.com>
245
+* en/test-without-test-create-repo (2022-08-26) 1 commit
246
+ (merged to 'next' on 2022-08-30 at 4f80f48e27)
247
+ + t64xx: convert 'test_create_repo' to 'git init'
248
249
+ Test clean-up.
250
+
251
+ Will merge to 'master'.
252
+ source: <pull.1303.v2.git.git.1661485759789.gitgitgadget@gmail.com>
253
73
-* en/submodule-merge-messages-fixes (2022-08-18) 3 commits
74
- (merged to 'next' on 2022-08-18 at eb89a1e70f)
75
- + merge-ort: provide helpful submodule update message when possible
76
- + merge-ort: avoid surprise with new sub_flag variable
77
- + merge-ort: remove translator lego in new "submodule conflict suggestion"
78
- (this branch uses cw/submodule-merge-messages.)
254
80
- Further update the help messages given while merging submodules.
81
- source: <pull.1325.v3.git.1660806927.gitgitgadget@gmail.com>
255
+* es/t4301-sed-portability-fix (2022-08-29) 4 commits
256
+ (merged to 'next' on 2022-08-30 at eec0ceef0a)
257
+ + t4301: emit blank line in more idiomatic fashion
258
+ + t4301: fix broken &&-chains and add missing loop termination
259
+ + t4301: account for behavior differences between sed implementations
260
+ + Merge branch 'en/t4301-more-merge-tree-tests' into es/t4301-sed-portability-fix
261
+ (this branch uses en/t4301-more-merge-tree-tests.)
262
263
+ Test clean-up.
264
+
265
+ Will merge to 'master'.
266
+ source: <pull.1339.git.1661663879.gitgitgadget@gmail.com>
267
84
-* jk/is-promisor-object-keep-tree-in-use (2022-08-14) 1 commit
85
- (merged to 'next' on 2022-08-17 at 96033ff88d)
86
- + is_promisor_object(): fix use-after-free of tree buffer
268
88
- An earlier optimization discarded a tree-object buffer that is
89
- still in use, which has been corrected.
90
- source: <YviWO9Bhz5PU1HaL@coredump.intra.peff.net>
269
+* gc/submodule-propagate-branches (2022-08-29) 6 commits
270
+ - clone, submodule update: check out branches
271
+ - submodule--helper: refactor up-to-date criterion
272
+ - submodule: return target of submodule symref
273
+ - t5617: drop references to remote-tracking branches
274
+ - repo-settings: add submodule_propagate_branches
275
+ - clone: teach --detach option
276
+
277
+ "git clone --recurse-submodules" and "git submodule update" learns
278
+ to honor the "propagete branches" option.
279
+
280
+ Needs review.
281
+ source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
282
283
93
-* jk/pipe-command-nonblock (2022-08-17) 6 commits
94
- (merged to 'next' on 2022-08-17 at 91fe8e6354)
95
- + pipe_command(): mark stdin descriptor as non-blocking
96
- + pipe_command(): handle ENOSPC when writing to a pipe
97
- + pipe_command(): avoid xwrite() for writing to pipe
98
- + git-compat-util: make MAX_IO_SIZE define globally available
99
- + nonblock: support Windows
100
- + compat: add function to enable nonblocking pipes
284
+* rs/test-mergesort (2022-08-28) 2 commits
285
+ (merged to 'next' on 2022-08-30 at 4905149886)
286
+ + test-mergesort: use mem_pool for sort input
287
+ + test-mergesort: read sort input all at once
288
102
- Fix deadlocks between main Git process and subprocess spawned via
103
- the pipe_command() API, that can kill "git add -p" that was
104
- reimplemented in C recently.
105
- source: <YvyE1RDFVAg4uQo1@coredump.intra.peff.net>
289
+ Optimization of a test-helper command.
290
291
+ Will merge to 'master'.
292
+ source: <128f0fb8-d29b-8622-0cfe-2ecadc999db5@web.de>
293
+
294
+
295
+* jc/format-patch-force-in-body-from (2022-08-29) 3 commits
296
+ - format-patch: learn format.forceInBodyFrom configuration variable
297
+ - format-patch: allow forcing the use of in-body From: header
298
+ - pretty: separate out the logic to decide the use of in-body from
299
+
300
+ "git format-patch --from=<ident>" can be told to add an in-body
301
+ "From:" line even for commits that are authored by the given
302
+ <ident> with "--force-in-body-from"option.
303
+
304
+ Will merge to 'next'?
305
+ source: <20220829213837.13849-1-gitster@pobox.com>
306
108
-* js/fetch-negotiation-trace (2022-08-15) 1 commit
109
- (merged to 'next' on 2022-08-17 at 2c9e07b617)
110
- + fetch-pack: add tracing for negotiation rounds
307
112
- The common ancestor negotiation exchange during a "git fetch"
113
- session now leaves trace log.
114
- source: <4390677ec75d51487142adf7c2ab821cbd24a53e.1659477669.git.steadmon@google.com>
308
+* sy/sparse-grep (2022-08-29) 2 commits
309
+ - builtin/grep.c: integrate with sparse index
310
+ - builtin/grep.c: add --sparse option
311
312
+ source: <20220829232843.183711-1-shaoxuan.yuan02@gmail.com>
313
117
-* vd/scalar-generalize-diagnose (2022-08-12) 11 commits
118
- (merged to 'next' on 2022-08-18 at bd8e574713)
119
- + scalar: update technical doc roadmap
120
- + scalar-diagnose: use 'git diagnose --mode=all'
121
- + builtin/bugreport.c: create '--diagnose' option
122
- + builtin/diagnose.c: add '--mode' option
123
- + builtin/diagnose.c: create 'git diagnose' builtin
124
- + diagnose.c: add option to configure archive contents
125
- + scalar-diagnose: move functionality to common location
126
- + scalar-diagnose: move 'get_disk_info()' to 'compat/'
127
- + scalar-diagnose: add directory to archiver more gently
128
- + scalar-diagnose: avoid 32-bit overflow of size_t
129
- + scalar-diagnose: use "$GIT_UNZIP" in test
314
131
- The "diagnose" feature to create a zip archive for diagnostic
132
- material has been lifted from "scalar" and made into a feature of
133
- "git bugreport".
134
- source: <pull.1310.v4.git.1660335019.gitgitgadget@gmail.com>
315
+* cc/doc-trailer-whitespace-rules (2022-08-30) 1 commit
316
+ - Documentation: clarify whitespace rules for trailers
317
+
318
+ source: <20220830105046.324041-1-christian.couder@gmail.com>
319
+
320
+
321
+* js/builtin-add-p-portability-fix (2022-08-30) 3 commits
322
+ - t6132(NO_PERL): do not run the scripted `add -p`
323
+ - t3701: test the built-in `add -i` regardless of NO_PERL
324
+ - add -p: avoid ambiguous signed/unsigned comparison
325
+
326
+ source: <pull.1340.git.1661867664.gitgitgadget@gmail.com>
327
328
--------------------------------------------------
329
[Cooking]
330
331
+* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
332
+ - grep: fix multibyte regex handling under macOS
333
+
334
+ With a bit of header twiddling, use the native regexp library on
335
+ macOS instead of the compat/ one.
336
+
337
+ Needs review.
338
+ source: <20220826085815.2771102-1-dds@aueb.gr>
339
+
340
+
341
* ds/bundle-uri-3 (2022-08-24) 8 commits
342
- bundle-uri: fetch a list of bundles
343
- bundle-uri: limit recursion depth for bundle lists
@@ -167,54 +369,6 @@ Release tarballs are available at:
369
source: <610b8d089db97bf1a37dbf230f51ecafe3086254.1661222541.git.gitgitgadget@gmail.com>
370
371
170
-* es/fix-chained-tests (2022-08-24) 4 commits
171
- (merged to 'next' on 2022-08-24 at 6266835a6e)
172
- + t5329: notice a failure within a loop
173
- (merged to 'next' on 2022-08-22 at 3774cfdaf4)
174
- + t: detect and signal failure within loop
175
- + t1092: fix buggy sparse "blame" test
176
- + t2407: fix broken &&-chains in compound statement
177
-
178
- Fix broken "&&-" chains and failures in early iterations of a loop.
179
-
180
- Will merge to 'master'.
181
- source: <pull.1312.git.git.1661192802.gitgitgadget@gmail.com>
182
-
183
-
184
-* ad/preload-plug-memleak (2022-08-22) 1 commit
185
- (merged to 'next' on 2022-08-24 at 1cad371f1c)
186
- + preload-index: fix memleak
187
-
188
- The preload-index codepath made copies of pathspec to give to
189
- multiple threads, which were left leaked.
190
-
191
- Will merge to 'master'.
192
- source: <20220822211507.8693-2-anthony.2lannoy@gmail.com>
193
-
194
-
195
-* sg/xcalloc-cocci-fix (2022-08-24) 1 commit
196
- (merged to 'next' on 2022-08-24 at 84c05819d3)
197
- + promisor-remote: fix xcalloc() argument order
198
-
199
- xcalloc(), imitating calloc(), takes "number of elements of the
200
- array", and "size of a single element", in this order. A call that
201
- does not follow this ordering has been corrected.
202
-
203
- Will merge to 'master'.
204
- source: <20220823095733.58685-1-szeder.dev@gmail.com>
205
-
206
-
207
-* ds/github-actions-use-newer-ubuntu (2022-08-24) 1 commit
208
- (merged to 'next' on 2022-08-24 at 55a76348b2)
209
- + ci: update 'static-analysis' to Ubuntu 22.04
210
-
211
- Update the version of Ubuntu used for GitHub Actions CI from 18.04
212
- to 22.04.
213
-
214
- Will merge to 'master'.
215
- source: <pull.1334.git.1661275691795.gitgitgadget@gmail.com>
216
-
217
-
372
* en/merge-multi-strategies (2022-08-24) 2 commits
373
(merged to 'next' on 2022-08-25 at 420e2eae66)
374
+ merge: small code readability improvement
@@ -230,6 +384,7 @@ Release tarballs are available at:
384
* en/t4301-more-merge-tree-tests (2022-08-24) 1 commit
385
(merged to 'next' on 2022-08-25 at c7abf60ff4)
386
+ t4301: add more interesting merge-tree testcases
387
+ (this branch is used by es/t4301-sed-portability-fix.)
388
389
More tests to protect the current behaviour of "merge-tree" before
390
it gets further updated.
@@ -238,17 +393,18 @@ Release tarballs are available at:
393
source: <pull.1332.git.1661237316150.gitgitgadget@gmail.com>
394
395
241
-* js/add-p-diff-parsing-fix (2022-08-24) 4 commits
396
+* js/add-p-diff-parsing-fix (2022-08-29) 5 commits
397
- add -p: ignore dirty submodules
398
- add -p: handle `diff-so-fancy`'s hunk headers better
399
+ - add -p: insert space in colored hunk header as needed
400
- add -p: gracefully ignore unparseable hunk headers in colored diffs
401
- t3701: redefine what is "bogus" output of a diff filter
402
403
Those who use diff-so-fancy as the diff-filter noticed a regression
404
or two in the reimplemented "add -p", which has been corrected.
405
250
- Needs review.
251
- source: <pull.1336.v2.git.1661376112.gitgitgadget@gmail.com>
406
+ Will merge to 'next'?
407
+ source: <pull.1336.v3.git.1661785916.gitgitgadget@gmail.com>
408
409
410
* js/cmake-updates (2022-08-24) 5 commits
@@ -275,27 +431,6 @@ Release tarballs are available at:
431
source: <pull.1335.v2.git.1661506770.gitgitgadget@gmail.com>
432
433
278
-* en/ort-unused-code-removal (2022-08-19) 1 commit
279
- (merged to 'next' on 2022-08-22 at f09dbeeca3)
280
- + merge-ort: remove code obsoleted by other changes
281
-
282
- Code clean-up.
283
-
284
- Will merge to 'master'.
285
- source: <pull.1302.git.git.1660884355643.gitgitgadget@gmail.com>
286
-
287
-
288
-* jd/prompt-show-conflict (2022-08-19) 1 commit
289
- (merged to 'next' on 2022-08-19 at 83af487823)
290
- + git-prompt: show presence of unresolved conflicts at command prompt
291
-
292
- The bash prompt (in contrib/) learned to optionally indicate when
293
- the index is unmerged.
294
-
295
- Will merge to 'master'.
296
- source: <pull.1302.v3.git.1660695492382.gitgitgadget@gmail.com>
297
-
298
-
434
* jk/unused-annotation (2022-08-19) 11 commits
435
(merged to 'next' on 2022-08-24 at 2174b8c75d)
436
+ is_path_owned_by_current_uid(): mark "report" parameter as unused
@@ -314,40 +449,12 @@ Release tarballs are available at:
449
removed for structural reasons), to prepare us to later compile
450
with -Wunused warning turned on.
451
317
- Will merge to 'master'.
452
+ Will revert; coccinelle cannot even parse the annotation correctly.
453
+ cf. <Ywh7ppVFk6VK1Ybs@coredump.intra.peff.net>
454
+ cf. <xmqqy1v7r3so.fsf@gitster.g>
455
source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
456
457
321
-* jk/unused-fixes (2022-08-20) 7 commits
322
- (merged to 'next' on 2022-08-22 at 2fe4de2aed)
323
- + xdiff: drop unused mmfile parameters from xdl_do_patience_diff()
324
- + reflog: assert PARSE_OPT_NONEG in parse-options callbacks
325
- + reftable: drop unused parameter from reader_seek_linear()
326
- + verify_one_sparse(): drop unused parameters
327
- + match_pathname(): drop unused "flags" parameter
328
- + log-tree: drop unused commit param in remerge_diff()
329
- + xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
330
-
331
- Code clean-up to remove unused function parameters.
332
-
333
- Will merge to 'master'.
334
- source: <Yv9Oay+tNqhLDqVl@coredump.intra.peff.net>
335
- source: <YwCjOETsh1o8u0Og@coredump.intra.peff.net>
336
-
337
-
338
-* mg/sequencer-untranslate-reflog (2022-08-19) 3 commits
339
- (merged to 'next' on 2022-08-22 at 75aadeb865)
340
- + sequencer: do not translate command names
341
- + sequencer: do not translate parameters to error_resolve_conflict()
342
- + sequencer: do not translate reflog messages
343
-
344
- The sequencer machinery translated messages left in the reflog by
345
- mistake, which has been corrected.
346
-
347
- Will merge to 'master'.
348
- source: <cover.1660828108.git.git@grubix.eu>
349
-
350
-
458
* tb/midx-with-changing-preferred-pack-fix (2022-08-22) 7 commits
459
(merged to 'next' on 2022-08-26 at 305a9d3323)
460
+ midx.c: avoid adding preferred objects twice
@@ -365,50 +472,6 @@ Release tarballs are available at:
472
source: <cover.1661197803.git.me@ttaylorr.com>
473
474
368
-* vd/fix-perf-tests (2022-08-19) 2 commits
369
- (merged to 'next' on 2022-08-22 at e68356e624)
370
- + p0006: fix 'read-tree' argument ordering
371
- + p0004: fix prereq declaration
372
-
373
- Rather trivial perf-test code fixes.
374
-
375
- Will merge to 'master'.
376
- source: <pull.1330.git.1660942149.gitgitgadget@gmail.com>
377
-
378
-
379
-* vd/scalar-enables-fsmonitor (2022-08-18) 8 commits
380
- (merged to 'next' on 2022-08-19 at 1e172e5647)
381
- + scalar: update technical doc roadmap with FSMonitor support
382
- + scalar unregister: stop FSMonitor daemon
383
- + scalar: enable built-in FSMonitor on `register`
384
- + scalar: move config setting logic into its own function
385
- + scalar-delete: do not 'die()' in 'delete_enlistment()'
386
- + scalar-[un]register: clearly indicate source of error
387
- + scalar-unregister: handle error codes greater than 0
388
- + scalar: constrain enlistment search
389
-
390
- "scalar" now enables built-in fsmonitor on enlisted repositories,
391
- when able.
392
-
393
- Will merge to 'master'.
394
- source: <pull.1324.v3.git.1660858853.gitgitgadget@gmail.com>
395
-
396
-
397
-* en/ancestry-path-in-a-range (2022-08-19) 3 commits
398
- (merged to 'next' on 2022-08-19 at 4fce3015b3)
399
- + revision: allow --ancestry-path to take an argument
400
- + t6019: modernize tests with helper
401
- + rev-list-options.txt: fix simple typo
402
-
403
- "git rev-list --ancestry-path=C A..B" is a natural extension of
404
- "git rev-list A..B"; instead of choosing a subset of A..B to those
405
- that have ancestry relationship with A, it lets a subset with
406
- ancestry relationship with C.
407
-
408
- Will merge to 'master'.
409
- source: <pull.1303.v3.git.1660883290.gitgitgadget@gmail.com>
410
-
411
-
475
* ed/fsmonitor-on-network-disk (2022-08-24) 3 commits
476
- Check working directory and Unix domain socket file for compatability
477
- fsmonitor: macOS: allow fsmonitor to run against network-mounted repos
@@ -527,6 +590,7 @@ Release tarballs are available at:
590
+ t5505-remote.sh: check the behavior without a subcommand
591
+ t3301-notes.sh: check that default operation mode doesn't take arguments
592
+ git.c: update NO_PARSEOPT markings
593
+ (this branch is used by js/bisect-in-c.)
594
595
Introduce the "subcommand" mode to parse-options API and update the
596
command line parser of Git commands with subcommands.
@@ -554,32 +618,12 @@ Release tarballs are available at:
618
source: <5229519b-3af2-a023-8996-43343b130722@github.com>
619
620
557
-* ds/decorate-filter-tweak (2022-08-05) 11 commits
558
- (merged to 'next' on 2022-08-19 at 064b9daa85)
559
- + fetch: use ref_namespaces during prefetch
560
- + maintenance: stop writing log.excludeDecoration
561
- + log: create log.initialDecorationSet=all
562
- + log: add --clear-decorations option
563
- + log: add default decoration filter
564
- + log-tree: use ref_namespaces instead of if/else-if
565
- + refs: use ref_namespaces for replace refs base
566
- + refs: add array of ref namespaces
567
- + t4207: test coloring of grafted decorations
568
- + t4207: modernize test
569
- + refs: allow "HEAD" as decoration filter
570
-
571
- The namespaces used by "log --decorate" from "refs/" hierarchy by
572
- default has been tightened.
573
-
574
- Will merge to 'master'.
575
- source: <pull.1301.v3.git.1659722323.gitgitgadget@gmail.com>
576
-
577
-
621
* es/doc-creation-factor-fix (2022-07-28) 2 commits
622
- range-diff: clarify --creation-factor=<factor>
623
- format-patch: clarify --creation-factor=<factor>
624
582
- Expecting a reroll.
625
+ Expecting a reroll by somebody more familiar with the logic
626
+ cf. <xmqqo7wfix7p.fsf@gitster.g>
627
source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
628
629
@@ -662,30 +706,6 @@ Release tarballs are available at:
706
source: <20220728230210.2952731-1-calvinwan@google.com>
707
708
665
-* mt/rot13-in-c (2022-08-14) 4 commits
666
- (merged to 'next' on 2022-08-19 at 22152a150c)
667
- + tests: use the new C rot13-filter helper to avoid PERL prereq
668
- + t0021: implementation the rot13-filter.pl script in C
669
- + t0021: avoid grepping for a Perl-specific string at filter output
670
- + Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
671
-
672
- Test portability improvements.
673
-
674
- Will merge to 'master'.
675
- source: <cover.1660522524.git.matheus.bernardino@usp.br>
676
-
677
-
678
-* tl/trace2-config-scope (2022-08-11) 2 commits
679
- (merged to 'next' on 2022-08-22 at 75a09c7a34)
680
- + tr2: shows scope unconditionally in addition to key-value pair
681
- + api-trace2.txt: print config key-value pair
682
-
683
- Tweak trace2 output about configuration variables.
684
-
685
- Will merge to 'master'.
686
- source: <cover.1660272404.git.dyroneteng@gmail.com>
687
-
688
-
709
* ab/submodule-helper-leakfix (2022-08-22) 18 commits
710
- submodule--helper: fix a configure_added_submodule() leak
711
- submodule--helper: free rest of "displaypath" in "struct update_data"
@@ -726,7 +746,9 @@ Release tarballs are available at:
746
source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
747
748
729
-* ac/bitmap-lookup-table (2022-08-26) 6 commits
749
+* ac/bitmap-lookup-table (2022-08-28) 7 commits
750
+ (merged to 'next' on 2022-08-29 at 05d2d2c8bd)
751
+ + pack-bitmap-write: drop unused pack_idx_entry parameters
752
(merged to 'next' on 2022-08-26 at 7914c141eb)
753
+ bitmap-lookup-table: add performance tests for lookup table
754
+ pack-bitmap: prepare to read lookup table extension
@@ -738,34 +760,35 @@ Release tarballs are available at:
760
The pack bitmap file gained a bitmap-lookup table to speed up
761
locating the necessary bitmap for a given commit.
762
741
- Will merge to 'next'?
742
- cf. <Ywf01YqJKNsGfffx@nand.local>
763
+ Will merge to 'master'.
764
source: <pull.1266.v6.git.1660496112.gitgitgadget@gmail.com>
765
766
746
-* js/bisect-in-c (2022-06-27) 16 commits
767
+* js/bisect-in-c (2022-08-27) 17 commits
768
- bisect: no longer try to clean up left-over `.git/head-name` files
769
- bisect: remove Cogito-related code
770
- Turn `git bisect` into a full built-in
771
- bisect: move even the command-line parsing to `bisect--helper`
751
- - bisect: teach the `bisect--helper` command to show the correct usage strings
752
- - bisect--helper: return only correct exit codes in `cmd_*()`
753
- - bisect--helper: move the `BISECT_STATE` case to the end
754
- - bisect--helper: make `--bisect-state` optional
755
- - bisect--helper: align the sub-command order with git-bisect.sh
756
- - bisect--helper: using `--bisect-state` without an argument is a bug
757
- - bisect--helper: really retire `--bisect-autostart`
758
- - bisect--helper: really retire --bisect-next-check
759
- - bisect--helper: retire the --no-log option
772
+ - bisect--helper: make `state` optional
773
+ - bisect--helper: calling `bisect_state()` without an argument is a bug
774
- bisect: avoid double-quoting when printing the failed command
775
- bisect run: fix the error message
776
- bisect: verify that a bogus option won't try to start a bisection
777
+ - bisect--helper: migrate to OPT_SUBCOMMAND()
778
+ - bisect--helper: make the order consistently `argc, argv`
779
+ - bisect--helper: make `terms` an explicit singleton
780
+ - bisect--helper: simplify exit code computation
781
+ - bisect--helper: really retire `--bisect-autostart`
782
+ - bisect--helper: really retire --bisect-next-check
783
+ - bisect--helper: retire the --no-log option
784
+ - Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
785
+ (this branch uses sg/parse-options-subcommand.)
786
787
Final bits of "git bisect.sh" have been rewritten in C.
788
789
Expecting a (hopefully final) reroll.
790
cf. <20627.86ilolhnnn.gmgdl@evledraar.gmail.com>
768
- source: <pull.1132.v4.git.1656354677.gitgitgadget@gmail.com>
791
+ source: <pull.1132.v5.git.1661604264.gitgitgadget@gmail.com>
792
793
--------------------------------------------------
794
[Discarded]