What's cooking (2023/07 #04)
Junio C Hamano committed
Jul 19, 2023 at 12:20 UTC
a591f232b5e903e01be88bd3150ed0aa365cf958
1 file changed
+427
-240
whats-cooking.txt
+427
-240
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2023, #03; Thu, 13)
3
-X-master-at: aa9166bcc0ba654fc21f198a30647ec087f733ed
4
-X-next-at: 6d72f3e9957d90c2c3269bbf808b5f7ffda9b026
2
+Subject: What's cooking in git.git (Jul 2023, #04; Wed, 19)
3
+X-master-at: cba07a324d2cda06dd7a7b35b4579f800de024aa
4
+X-next-at: 738d25bbb685449ecded16e19329234bf5fa711f
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2023, #03; Thu, 13)
7
+What's cooking in git.git (Jul 2023, #04; Wed, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,10 +17,6 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
-There are quite a few topics that have been in "Expecting a reroll"
21
-for too long. I've moved those that are more than 3 months old to
22
-the "Will discard" section.
23
-
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
22
repositories have only a subset of branches.
@@ -49,75 +45,380 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* cw/compat-util-header-cleanup (2023-07-05) 6 commits
52
+ (merged to 'next' on 2023-07-08 at c244b65c4f)
53
+ + git-compat-util: move alloc macros to git-compat-util.h
54
+ + treewide: remove unnecessary includes for wrapper.h
55
+ + kwset: move translation table from ctype
56
+ + sane-ctype.h: create header for sane-ctype macros
57
+ + git-compat-util: move wrapper.c funcs to its header
58
+ + git-compat-util: move strbuf.c funcs to its header
59
+
60
+ Further shuffling of declarations across header files to streamline
61
+ file dependencies.
62
+ source: <20230705170812.3833103-1-calvinwan@google.com>
63
+
64
+
65
+* jc/pathspec-match-with-common-prefix (2023-07-08) 2 commits
66
+ (merged to 'next' on 2023-07-10 at 4146f391ed)
67
+ + dir: match "attr" pathspec magic with correct paths
68
+ + t6135: attr magic with path pattern
69
+
70
+ "git ls-files '(attr:X)D/'" that triggers the common prefix
71
+ optimization codepath failed to read from "D/.gitattributes",
72
+ which has been corrected.
73
+ source: <20230707220457.3655121-1-gitster@pobox.com>
74
+
75
+
76
+* jk/imap-send-unused-variable-cleanup (2023-07-05) 3 commits
77
+ (merged to 'next' on 2023-07-06 at d2798ee0fe)
78
+ + imap-send: drop unused fields from imap_cmd_cb
79
+ + imap-send: drop unused parameter from imap_cmd_cb callback
80
+ + imap-send: use server conf argument in setup_curl()
81
+
82
+ "imap-send" codepaths got cleaned up to get rid of unused
83
+ parameters.
84
+ source: <20230703063247.GA3524302@coredump.intra.peff.net>
85
+
86
+
87
+* ks/ref-filter-signature (2023-06-06) 2 commits
88
+ (merged to 'next' on 2023-07-06 at 1748d2bb93)
89
+ + ref-filter: add new "signature" atom
90
+ + t/lib-gpg: introduce new prereq GPG2
91
+
92
+ The "git for-each-ref" family of commands learned placeholders
93
+ related to GPG signature verification.
94
+ cf. <CAP8UFD1CfUm+9PTXO0wBBdBs0U=YVte+EiPbDyUyg7T152aw2g@mail.gmail.com>
95
+ source: <20230604185815.15761-1-five231003@gmail.com>
96
+
97
+
98
+* ma/t0091-fixup (2023-07-05) 1 commit
99
+ (merged to 'next' on 2023-07-06 at 3f82b468b4)
100
+ + t0091-bugreport.sh: actually verify some content of report
101
+
102
+ "git bugreport" tests did not test what it wanted to test, which
103
+ has been corrected.
104
+ source: <20230705183532.3057433-1-martin.agren@gmail.com>
105
+
106
+
107
+* mh/doc-credential-helpers (2023-07-10) 1 commit
108
+ (merged to 'next' on 2023-07-11 at a391669194)
109
+ + doc: gitcredentials: link to helper list
110
+
111
+ Doc update.
112
+ source: <pull.1538.v3.git.1688848614262.gitgitgadget@gmail.com>
113
+
114
+
115
+* pw/diff-no-index-from-named-pipes (2023-07-05) 4 commits
116
+ (merged to 'next' on 2023-07-08 at 225230a441)
117
+ + diff --no-index: support reading from named pipes
118
+ + t4054: test diff --no-index with stdin
119
+ + diff --no-index: die on error reading stdin
120
+ + diff --no-index: refuse to compare stdin to a directory
121
+
122
+ "git diff --no-index" learned to read from named pipes as if they
123
+ were regular files, to allow "git diff <(process) <(substitution)"
124
+ some shells support.
125
+ source: <cover.1688586536.git.phillip.wood@dunelm.org.uk>
126
+
127
+
128
+* rs/ls-tree-prefix-simplify (2023-07-07) 1 commit
129
+ (merged to 'next' on 2023-07-08 at 3e4826525f)
130
+ + ls-tree: simplify prefix handling
131
+
132
+ Code simplification.
133
+ source: <b34aa99b-2bf1-c645-bdf5-03ac258b4bf5@web.de>
134
+
135
+
136
+* rs/packet-length-simplify (2023-07-07) 1 commit
137
+ (merged to 'next' on 2023-07-08 at 7f4b52e75b)
138
+ + pkt-line: add size parameter to packet_length()
139
+
140
+ Code simplification.
141
+ source: <4d2bb49b-9c3c-ea58-274b-d9e9586620c1@web.de>
142
+
143
+
144
+* rs/pretty-format-double-negation-fix (2023-07-07) 1 commit
145
+ (merged to 'next' on 2023-07-08 at 6674b562ff)
146
+ + pretty: avoid double negative in format_commit_item()
147
+
148
+ Code clarification.
149
+ source: <8d4fcad1-5f71-4790-17ee-e9ba0a3118dc@web.de>
150
+
151
+
152
+* rs/userformat-find-requirements-simplify (2023-07-07) 1 commit
153
+ (merged to 'next' on 2023-07-08 at 6cdc328a08)
154
+ + pretty: use strchr(3) in userformat_find_requirements()
155
+
156
+ Code simplification.
157
+ source: <108ab1a2-28f4-dd62-1f90-64f37708aa8c@web.de>
158
+
159
+
160
+* tb/fsck-no-progress (2023-07-10) 6 commits
161
+ (merged to 'next' on 2023-07-11 at aab8389518)
162
+ + commit-graph.c: avoid duplicated progress output during `verify`
163
+ + commit-graph.c: pass progress to `verify_one_commit_graph()`
164
+ + commit-graph.c: iteratively verify commit-graph chains
165
+ + commit-graph.c: extract `verify_one_commit_graph()`
166
+ + fsck: suppress MIDX output with `--no-progress`
167
+ + fsck: suppress commit-graph output with `--no-progress`
168
+
169
+ "git fsck --no-progress" still spewed noise from the commit-graph
170
+ subsystem, which has been corrected.
171
+ source: <cover.1688776280.git.me@ttaylorr.com>
172
+
173
+
174
+* tb/repack-cleanup (2023-07-11) 2 commits
175
+ (merged to 'next' on 2023-07-11 at f598c59a8a)
176
+ + builtin/repack.c: avoid dir traversal in `collect_pack_filenames()`
177
+ + builtin/repack.c: only repack `.pack`s that exist
178
+
179
+ The recent change to "git repack" made it react less nicely when a
180
+ leftover .idx file that no longer has the corresponding .pack file
181
+ in the repository, which has been corrected.
182
+ source: <cover.1689096750.git.me@ttaylorr.com>
183
+
184
+
185
+* vd/adjust-mfow-doc-to-updated-headers (2023-07-04) 1 commit
186
+ (merged to 'next' on 2023-07-08 at 38103c697d)
187
+ + docs: add necessary headers to Documentation/MFOW.txt
188
+
189
+ Code snippets in a tutorial document no longer compiled after
190
+ recent header shuffling, which have been corrected.
191
+ source: <20230702151457.3227-1-vinayakdev.sci@gmail.com>
192
+
193
--------------------------------------------------
194
[New Topics]
195
55
-* ah/configure-no-expat (2023-07-13) 1 commit
56
- - configure.ac: Don't overwrite NO_EXPAT option
196
+* dk/bundle-i18n-more (2023-07-13) 1 commit
197
+ (merged to 'next' on 2023-07-18 at a9745efbe2)
198
+ + i18n: mark more bundle.c strings for translation
199
58
- "./configure --with-expat=no" did not work as a way to refuse use
59
- of the expat library on a system with the library installed, which
200
+ Update message mark-up for i18n in "git bundle".
201
+
202
+ Will merge to 'master'.
203
+ source: <pull.1550.git.1689285683013.gitgitgadget@gmail.com>
204
+
205
+
206
+* jk/unused-parameter (2023-07-13) 14 commits
207
+ (merged to 'next' on 2023-07-18 at 59d8f4ec1e)
208
+ + t/helper: mark unused callback void data parameters
209
+ + tag: mark unused parameters in each_tag_name_fn callbacks
210
+ + rev-parse: mark unused parameter in for_each_abbrev callback
211
+ + replace: mark unused parameter in each_mergetag_fn callback
212
+ + replace: mark unused parameter in ref callback
213
+ + merge-tree: mark unused parameter in traverse callback
214
+ + fsck: mark unused parameters in various fsck callbacks
215
+ + revisions: drop unused "opt" parameter in "tweak" callbacks
216
+ + count-objects: mark unused parameter in alternates callback
217
+ + am: mark unused keep_cr parameters
218
+ + http-push: mark unused parameter in xml callback
219
+ + http: mark unused parameters in curl callbacks
220
+ + do_for_each_ref_helper(): mark unused repository parameter
221
+ + test-ref-store: drop unimplemented reflog-expire command
222
+
223
+ Mark-up unused parameters in the code so that we can eventually
224
+ enable -Wunused-parameter by default.
225
+
226
+ Will merge to 'master'.
227
+ source: <20230703064347.GA3524892@coredump.intra.peff.net>
228
+
229
+
230
+* dk/t4002-syntaxo-fix (2023-07-14) 1 commit
231
+ (merged to 'next' on 2023-07-17 at 75d729ee52)
232
+ + t4002: fix "diff can read from stdin" syntax
233
+
234
+ Test fix.
235
+
236
+ Will merge to 'master'.
237
+ source: <pull.1545.git.git.1689341410476.gitgitgadget@gmail.com>
238
+
239
+
240
+* la/doc-choose-starting-point (2023-07-14) 5 commits
241
+ (merged to 'next' on 2023-07-19 at 5a807cae46)
242
+ + SubmittingPatches: simplify guidance for choosing a starting point
243
+ + SubmittingPatches: emphasize need to communicate non-default starting points
244
+ + SubmittingPatches: de-emphasize branches as starting points
245
+ + SubmittingPatches: discuss subsystems separately from git.git
246
+ + SubmittingPatches: reword awkward phrasing
247
+
248
+ Clarify how to choose the starting point for a new topic in
249
+ developer guidance document.
250
+
251
+ Will merge to 'master'.
252
+ source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
253
+
254
+
255
+* rs/ref-filter-signature-fix (2023-07-17) 1 commit
256
+ (merged to 'next' on 2023-07-18 at e74f016a60)
257
+ + t6300: fix setup with GPGSSH but without GPG
258
+
259
+ Test fix.
260
+
261
+ Will merge to 'master'.
262
+ source: <cbc22750-af93-9274-2ed4-6dfd356568e8@web.de>
263
+
264
+
265
+* rs/strbuf-addftime-simplify (2023-07-17) 1 commit
266
+ (merged to 'next' on 2023-07-18 at d665b0f0e9)
267
+ + strbuf: use skip_prefix() in strbuf_addftime()
268
+
269
+ Code clean-up.
270
+
271
+ Will merge to 'master'.
272
+ source: <fccba24c-584d-6329-69a7-75cf0458af7d@web.de>
273
+
274
+
275
+* jk/nested-points-at (2023-07-17) 4 commits
276
+ (merged to 'next' on 2023-07-18 at cf33f44a50)
277
+ + ref-filter: simplify return type of match_points_at
278
+ + ref-filter: avoid parsing non-tags in match_points_at()
279
+ + ref-filter: avoid parsing tagged objects in match_points_at()
280
+ + ref-filter: handle nested tags in --points-at option
281
+
282
+ "git tag --list --points-at X" showed tags that directly refers to
283
+ object X, but did not list a tag that points at such a tag, which
284
has been corrected.
285
62
- Review response sent.
63
- cf. <xmqqwmz3pwx2.fsf@gitster.g>
64
- source: <20230713074654.23957-1-aherrmann@suse.de>
286
+ Will merge to 'master'.
287
+ source: <20230702223342.GA1598765@coredump.intra.peff.net>
288
289
67
-* jc/branch-in-use-error-message (2023-07-12) 1 commit
68
- - branch: update the message to refuse touching a branch in-use
290
+* jr/gitignore-doc-example-markup (2023-07-18) 1 commit
291
+ (merged to 'next' on 2023-07-19 at 4f2ece568d)
292
+ + gitignore.txt: use backticks instead of double quotes
293
70
- "git branch -f X" to repoint the branch X seid that X was "checked
71
- out" in another worktree, even when branch X was not and instead
72
- being bisected or rebased. The message was reworded to say the
73
- branch was "in use".
294
+ Doc update.
295
+
296
+ Will merge to 'master'.
297
+ source: <pull.1553.git.git.1689685982027.gitgitgadget@gmail.com>
298
+
299
+
300
+* jc/am-parseopt-fix (2023-07-18) 1 commit
301
+ (merged to 'next' on 2023-07-19 at eaf592531e)
302
+ + am: simplify parsing of "--[no-]keep-cr"
303
+
304
+ Code simplification.
305
+
306
+ Will merge to 'master'.
307
+ source: <xmqqr0p5gjv3.fsf@gitster.g>
308
+
309
+
310
+* jc/branch-parseopt-fix (2023-07-18) 1 commit
311
+ (merged to 'next' on 2023-07-19 at 738d25bbb6)
312
+ + branch: reject "--no-all" and "--no-remotes" early
313
+
314
+ Command line parser fixes.
315
+
316
+ Will merge to 'master'.
317
+ source: <xmqqjzuxgjmi.fsf@gitster.g>
318
+
319
+
320
+* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit
321
+ (merged to 'next' on 2023-07-19 at 86e570c084)
322
+ + ls-tree: fix --no-full-name
323
+
324
+ Command line parser fix.
325
+
326
+ Will merge to 'master'.
327
+ source: <d392a005-4eba-7cc7-9554-cdb8dc53975e@web.de>
328
+
329
+
330
+* jc/describe-parseopt-fix (2023-07-18) 1 commit
331
+ - describe: --no-exact-match should not be the same as --exact-match
332
+
333
+ Command line parser fix.
334
+
335
+ Comments?
336
+ source: <xmqqy1jcgbiv.fsf@gitster.g>
337
+
338
+
339
+* jc/doc-sent-patch-now-what (2023-07-19) 1 commit
340
+ - MyFirstContribution: refrain from self-iterating too much
341
+
342
+ Process document update.
343
344
Will merge to 'next'?
76
- source: <xmqqy1jkrcmg.fsf_-_@gitster.g>
345
+ source: <xmqqzga9opdu.fsf@gitster.g>
346
347
79
-* tb/object-access-overflow-protection (2023-07-12) 20 commits
80
- - commit-graph.c: prevent overflow in `verify_commit_graph()`
81
- - commit-graph.c: prevent overflow in `write_commit_graph()`
82
- - commit-graph.c: prevent overflow in `merge_commit_graph()`
83
- - commit-graph.c: prevent overflow in `split_graph_merge_strategy()`
84
- - commit-graph.c: prevent overflow in `load_tree_for_commit()`
85
- - commit-graph.c: prevent overflow in `fill_commit_in_graph()`
86
- - commit-graph.c: prevent overflow in `fill_commit_graph_info()`
87
- - commit-graph.c: prevent overflow in `load_oid_from_graph()`
88
- - commit-graph.c: prevent overflow in add_graph_to_chain()
89
- - commit-graph.c: prevent overflow in `write_commit_graph_file()`
90
- - pack-bitmap.c: ensure that eindex lookups don't overflow
91
- - midx.c: prevent overflow in `fill_included_packs_batch()`
92
- - midx.c: prevent overflow in `write_midx_internal()`
93
- - midx.c: store `nr`, `alloc` variables as `size_t`'s
94
- - midx.c: prevent overflow in `nth_midxed_offset()`
95
- - midx.c: prevent overflow in `nth_midxed_object_oid()`
96
- - midx.c: use `size_t`'s for fanout nr and alloc
97
- - packfile.c: use checked arithmetic in `nth_packed_object_offset()`
98
- - packfile.c: prevent overflow in `load_idx()`
99
- - packfile.c: prevent overflow in `nth_packed_object_id()`
348
+* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit
349
+ - gitignore.txt: mark up explanation of patterns consistently
350
101
- Various offset computation in the code that accesses the packfiles
102
- and other data in the object layer has been hardened against
103
- arithmetic overflow, especially on 32-bit systems.
351
+ Doc mark-up update.
352
105
- Expecting a reroll or a fix-up.
106
- cf. <5d2cf09f-34c7-9a88-bab2-8bf348dd13bb@gmail.com>
107
- source: <cover.1689205042.git.me@ttaylorr.com>
353
+ Will merge to 'next'.
354
+ source: <xmqqwmyxglhg.fsf@gitster.g>
355
356
110
-* jc/doc-submodule-update-settings (2023-07-13) 1 commit
111
- - submodule: clarify that "!custom command" is the only oddball
357
+* jc/parse-options-reset (2023-07-19) 1 commit
358
+ - reset: reject --no-(mixed|soft|hard|merge|keep) option
359
113
- Rewrite the description of giving a custom command to the
114
- submodule.<name>.update configuraiton variable.
360
+ Command line parser fix.
361
+
362
+ Will merge to 'next'.
363
+ source: <xmqq1qh4c998.fsf@gitster.g>
364
+
365
+
366
+* jc/parse-options-short-help (2023-07-18) 3 commits
367
+ - short help: allow a gap smaller than USAGE_GAP
368
+ - remote: simplify "remote add --tags" help text
369
+ - short help: allow multi-line opthelp
370
+
371
+ Command line parser fix, and a small parse-options API update.
372
+
373
+ Comments?
374
+ source: <xmqq5y6gg8fn.fsf@gitster.g>
375
+
376
+
377
+* jc/parse-options-show-branch (2023-07-19) 2 commits
378
+ - show-branch: reject --[no-](topo|date)-order
379
+ - show-branch: --no-sparse should give dense output
380
+
381
+ Command line parser fixes.
382
+
383
+ Will merge to 'next'.
384
+ source: <xmqqh6pzc15n.fsf@gitster.g>
385
116
- source: <xmqqwmz3oacg.fsf@gitster.g>
386
+
387
+* jc/transport-parseopt-fix (2023-07-18) 2 commits
388
+ - fetch: reject --no-ipv[46]
389
+ - parse-options: introduce OPT_IPVERSION()
390
+
391
+ Command line parser fixes.
392
+
393
+ Will merge to 'next'.
394
+ source: <xmqqedl4gag8.fsf@gitster.g>
395
+
396
+
397
+* sl/sparse-check-attr (2023-07-18) 3 commits
398
+ - check-attr: integrate with sparse-index
399
+ - attr.c: read attributes in a sparse directory
400
+ - t1092: add tests for 'git check-attr'
401
+
402
+ Teach "git check-attr" work better with sparse-index.
403
+
404
+ Needs review.
405
+ source: <20230718232916.31660-1-cheskaqiqi@gmail.com>
406
407
--------------------------------------------------
408
[Stalled]
409
410
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
411
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
412
+
413
+ "git cherry-pick A" that replays a single commit stopped before
414
+ clobbering local modification, but "git cherry-pick A..B" did not,
415
+ which has been corrected.
416
+
417
+ Expecting a reroll.
418
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
419
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
420
+
421
+
422
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
423
- fsmonitor: handle differences between Windows named pipe functions
424
@@ -287,176 +588,102 @@ Release tarballs are available at:
588
Expecting a reroll.
589
cf. <xmqqsfcthrpb.fsf@gitster.g>
590
cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
591
+ cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>
592
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
593
594
--------------------------------------------------
595
[Cooking]
596
295
-* ah/advise-force-pushing (2023-07-13) 3 commits
296
- - push: don't imply that integration is always required before pushing
297
- - remote: don't imply that integration is always required before pushing
298
- - wt-status: don't show divergence advice when committing
299
-
300
- Help newbies by suggesting that there are cases where force-pushing
301
- is a valid and sensible thing to update a branch at a remote
302
- repository, rather than reconciling with merge/rebase.
303
-
304
- Will merge to 'next'.
305
- cf. <919d1ba8-bb8b-a77b-cef3-db14f168ed4a@gmail.com>
306
- source: <20230713044128.3771818-1-alexhenrie24@gmail.com>
307
-
308
-
309
-* jc/pathspec-match-with-common-prefix (2023-07-08) 2 commits
310
- (merged to 'next' on 2023-07-10 at 4146f391ed)
311
- + dir: match "attr" pathspec magic with correct paths
312
- + t6135: attr magic with path pattern
313
-
314
- "git ls-files '(attr:X)D/'" that triggers the common prefix
315
- optimization codepath failed to read from "D/.gitattributes",
316
- which has been corrected.
317
-
318
- Will merge to 'master'.
319
- source: <20230707220457.3655121-1-gitster@pobox.com>
320
-
597
+* ah/autoconf-fixes (2023-07-19) 3 commits
598
+ - configure.ac: always save NO_ICONV to config.status
599
+ - configure.ac: don't overwrite NO_CURL option
600
+ - configure.ac: don't overwrite NO_EXPAT option
601
322
-* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
323
- - tree-walk: drop unused base_offset from do_match()
324
- - tree-walk: lose base_offset that is never used in tree_entry_interesting
325
-
326
- Code simplification.
602
+ "./configure --with-expat=no" did not work as a way to refuse use
603
+ of the expat library on a system with the library installed, which
604
+ has been corrected.
605
606
Needs review.
329
- source: <20230707222116.4129415-1-gitster@pobox.com>
607
+ source: <20230719145211.17854-2-aherrmann@suse.de>
608
609
332
-* rs/ls-tree-prefix-simplify (2023-07-07) 1 commit
333
- (merged to 'next' on 2023-07-08 at 3e4826525f)
334
- + ls-tree: simplify prefix handling
335
-
336
- Code simplification.
337
-
338
- Will merge to 'master'.
339
- source: <b34aa99b-2bf1-c645-bdf5-03ac258b4bf5@web.de>
340
-
341
-
342
-* rs/pretty-format-double-negation-fix (2023-07-07) 1 commit
343
- (merged to 'next' on 2023-07-08 at 6674b562ff)
344
- + pretty: avoid double negative in format_commit_item()
345
-
346
- Code clarification.
347
-
348
- Will merge to 'master'.
349
- source: <8d4fcad1-5f71-4790-17ee-e9ba0a3118dc@web.de>
350
-
351
-
352
-* rs/userformat-find-requirements-simplify (2023-07-07) 1 commit
353
- (merged to 'next' on 2023-07-08 at 6cdc328a08)
354
- + pretty: use strchr(3) in userformat_find_requirements()
355
-
356
- Code simplification.
357
-
358
- Will merge to 'master'.
359
- source: <108ab1a2-28f4-dd62-1f90-64f37708aa8c@web.de>
360
-
361
-
362
-* mh/doc-credential-helpers (2023-07-10) 1 commit
363
- (merged to 'next' on 2023-07-11 at a391669194)
364
- + doc: gitcredentials: link to helper list
365
-
366
- Doc update.
367
-
368
- Will merge to 'master'.
369
- source: <pull.1538.v3.git.1688848614262.gitgitgadget@gmail.com>
370
-
371
-
372
-* tb/fsck-no-progress (2023-07-10) 6 commits
373
- (merged to 'next' on 2023-07-11 at aab8389518)
374
- + commit-graph.c: avoid duplicated progress output during `verify`
375
- + commit-graph.c: pass progress to `verify_one_commit_graph()`
376
- + commit-graph.c: iteratively verify commit-graph chains
377
- + commit-graph.c: extract `verify_one_commit_graph()`
378
- + fsck: suppress MIDX output with `--no-progress`
379
- + fsck: suppress commit-graph output with `--no-progress`
380
-
381
- "git fsck --no-progress" still spewed noise from the commit-graph
382
- subsystem, which has been corrected.
383
-
384
- Will merge to 'master'.
385
- source: <cover.1688776280.git.me@ttaylorr.com>
386
-
387
-
388
-* tb/repack-cleanup (2023-07-11) 2 commits
389
- (merged to 'next' on 2023-07-11 at f598c59a8a)
390
- + builtin/repack.c: avoid dir traversal in `collect_pack_filenames()`
391
- + builtin/repack.c: only repack `.pack`s that exist
610
+* jc/branch-in-use-error-message (2023-07-12) 1 commit
611
+ . branch: update the message to refuse touching a branch in-use
612
393
- The recent change to "git repack" made it react less nicely when a
394
- leftover .idx file that no longer has the corresponding .pack file
395
- in the repository, which has been corrected.
613
+ "git branch -f X" to repoint the branch X seid that X was "checked
614
+ out" in another worktree, even when branch X was not and instead
615
+ being bisected or rebased. The message was reworded to say the
616
+ branch was "in use".
617
397
- Will merge to 'master'.
398
- source: <cover.1689096750.git.me@ttaylorr.com>
618
+ Just a weather-balloon.
619
+ source: <xmqqy1jkrcmg.fsf_-_@gitster.g>
620
621
401
-* cw/compat-util-header-cleanup (2023-07-05) 6 commits
402
- (merged to 'next' on 2023-07-08 at c244b65c4f)
403
- + git-compat-util: move alloc macros to git-compat-util.h
404
- + treewide: remove unnecessary includes for wrapper.h
405
- + kwset: move translation table from ctype
406
- + sane-ctype.h: create header for sane-ctype macros
407
- + git-compat-util: move wrapper.c funcs to its header
408
- + git-compat-util: move strbuf.c funcs to its header
622
+* tb/object-access-overflow-protection (2023-07-14) 20 commits
623
+ (merged to 'next' on 2023-07-17 at 9ad8a08011)
624
+ + commit-graph.c: prevent overflow in `verify_commit_graph()`
625
+ + commit-graph.c: prevent overflow in `write_commit_graph()`
626
+ + commit-graph.c: prevent overflow in `merge_commit_graph()`
627
+ + commit-graph.c: prevent overflow in `split_graph_merge_strategy()`
628
+ + commit-graph.c: prevent overflow in `load_tree_for_commit()`
629
+ + commit-graph.c: prevent overflow in `fill_commit_in_graph()`
630
+ + commit-graph.c: prevent overflow in `fill_commit_graph_info()`
631
+ + commit-graph.c: prevent overflow in `load_oid_from_graph()`
632
+ + commit-graph.c: prevent overflow in add_graph_to_chain()
633
+ + commit-graph.c: prevent overflow in `write_commit_graph_file()`
634
+ + pack-bitmap.c: ensure that eindex lookups don't overflow
635
+ + midx.c: prevent overflow in `fill_included_packs_batch()`
636
+ + midx.c: prevent overflow in `write_midx_internal()`
637
+ + midx.c: store `nr`, `alloc` variables as `size_t`'s
638
+ + midx.c: prevent overflow in `nth_midxed_offset()`
639
+ + midx.c: prevent overflow in `nth_midxed_object_oid()`
640
+ + midx.c: use `size_t`'s for fanout nr and alloc
641
+ + packfile.c: use checked arithmetic in `nth_packed_object_offset()`
642
+ + packfile.c: prevent overflow in `load_idx()`
643
+ + packfile.c: prevent overflow in `nth_packed_object_id()`
644
410
- Further shuffling of declarations across header files to streamline
411
- file dependencies.
645
+ Various offset computation in the code that accesses the packfiles
646
+ and other data in the object layer has been hardened against
647
+ arithmetic overflow, especially on 32-bit systems.
648
649
Will merge to 'master'.
414
- source: <20230705170812.3833103-1-calvinwan@google.com>
650
+ source: <ZLAJNbIBFUPHYhlt@nand.local>
651
+ source: <cover.1689205042.git.me@ttaylorr.com>
652
653
417
-* jk/imap-send-unused-variable-cleanup (2023-07-05) 3 commits
418
- (merged to 'next' on 2023-07-06 at d2798ee0fe)
419
- + imap-send: drop unused fields from imap_cmd_cb
420
- + imap-send: drop unused parameter from imap_cmd_cb callback
421
- + imap-send: use server conf argument in setup_curl()
654
+* jc/doc-submodule-update-settings (2023-07-13) 1 commit
655
+ . submodule: clarify that "!custom command" is the only oddball
656
423
- "imap-send" codepaths got cleaned up to get rid of unused
424
- parameters.
657
+ Rewrite the description of giving a custom command to the
658
+ submodule.<name>.update configuraiton variable.
659
426
- Will merge to 'master'.
427
- source: <20230703063247.GA3524302@coredump.intra.peff.net>
660
+ Just a weather-balloon.
661
+ source: <xmqqwmz3oacg.fsf@gitster.g>
662
663
430
-* ma/t0091-fixup (2023-07-05) 1 commit
431
- (merged to 'next' on 2023-07-06 at 3f82b468b4)
432
- + t0091-bugreport.sh: actually verify some content of report
664
+* ah/advise-force-pushing (2023-07-13) 3 commits
665
+ (merged to 'next' on 2023-07-17 at b040e8280e)
666
+ + push: don't imply that integration is always required before pushing
667
+ + remote: don't imply that integration is always required before pushing
668
+ + wt-status: don't show divergence advice when committing
669
434
- "git bugreport" tests did not test what it wanted to test, which
435
- has been corrected.
670
+ Help newbies by suggesting that there are cases where force-pushing
671
+ is a valid and sensible thing to update a branch at a remote
672
+ repository, rather than reconciling with merge/rebase.
673
674
Will merge to 'master'.
438
- source: <20230705183532.3057433-1-martin.agren@gmail.com>
675
+ cf. <919d1ba8-bb8b-a77b-cef3-db14f168ed4a@gmail.com>
676
+ source: <20230713044128.3771818-1-alexhenrie24@gmail.com>
677
678
441
-* rs/packet-length-simplify (2023-07-07) 1 commit
442
- (merged to 'next' on 2023-07-08 at 7f4b52e75b)
443
- + pkt-line: add size parameter to packet_length()
679
+* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
680
+ - tree-walk: drop unused base_offset from do_match()
681
+ - tree-walk: lose base_offset that is never used in tree_entry_interesting
682
683
Code simplification.
684
447
- Will merge to 'master'.
448
- source: <4d2bb49b-9c3c-ea58-274b-d9e9586620c1@web.de>
449
-
450
-
451
-* vd/adjust-mfow-doc-to-updated-headers (2023-07-04) 1 commit
452
- (merged to 'next' on 2023-07-08 at 38103c697d)
453
- + docs: add necessary headers to Documentation/MFOW.txt
454
-
455
- Code snippets in a tutorial document no longer compiled after
456
- recent header shuffling, which have been corrected.
457
-
458
- Will merge to 'master'.
459
- source: <20230702151457.3227-1-vinayakdev.sci@gmail.com>
685
+ Needs review.
686
+ source: <20230707222116.4129415-1-gitster@pobox.com>
687
688
689
* mh/credential-erase-improvements-more (2023-06-24) 2 commits
@@ -467,21 +694,6 @@ Release tarballs are available at:
694
source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
695
696
470
-* pw/diff-no-index-from-named-pipes (2023-07-05) 4 commits
471
- (merged to 'next' on 2023-07-08 at 225230a441)
472
- + diff --no-index: support reading from named pipes
473
- + t4054: test diff --no-index with stdin
474
- + diff --no-index: die on error reading stdin
475
- + diff --no-index: refuse to compare stdin to a directory
476
-
477
- "git diff --no-index" learned to read from named pipes as if they
478
- were regular files, to allow "git diff <(process) <(substitution)"
479
- some shells support.
480
-
481
- Will merge to 'master'.
482
- source: <cover.1688586536.git.phillip.wood@dunelm.org.uk>
483
-
484
-
697
* cc/repack-sift-filtered-objects-to-separate-pack (2023-07-05) 8 commits
698
- gc: add `gc.repackFilterTo` config option
699
- repack: implement `--filter-to` for storing filtered out objects
@@ -510,31 +722,20 @@ Release tarballs are available at:
722
723
724
* mh/mingw-case-sensitive-build (2023-06-12) 1 commit
513
- - mingw: use lowercase includes for some Windows headers
725
+ (merged to 'next' on 2023-07-17 at 2c72856851)
726
+ + mingw: use lowercase includes for some Windows headers
727
728
Names of MinGW header files are spelled in mixed case in some
729
source files, but the build host can be using case sensitive
730
filesystem with header files with their name spelled in all
731
lowercase.
732
520
- Needs review.
521
- source: <20230604211934.1365289-1-mh@glandium.org>
522
-
523
-
524
-* ks/ref-filter-signature (2023-06-06) 2 commits
525
- (merged to 'next' on 2023-07-06 at 1748d2bb93)
526
- + ref-filter: add new "signature" atom
527
- + t/lib-gpg: introduce new prereq GPG2
528
-
529
- The "git for-each-ref" family of commands learned placeholders
530
- related to GPG signature verification.
531
-
733
Will merge to 'master'.
533
- cf. <CAP8UFD1CfUm+9PTXO0wBBdBs0U=YVte+EiPbDyUyg7T152aw2g@mail.gmail.com>
534
- source: <20230604185815.15761-1-five231003@gmail.com>
734
+ cf. <xmqqmt14a36k.fsf@gitster.g>
735
+ source: <20230604211934.1365289-1-mh@glandium.org>
736
737
537
-* jt/path-filter-fix (2023-06-13) 4 commits
738
+* jt/path-filter-fix (2023-07-13) 4 commits
739
- commit-graph: new filter ver. that fixes murmur3
740
- repo-settings: introduce commitgraph.changedPathsVersion
741
- t4216: test changed path filters with high bit paths
@@ -543,22 +744,7 @@ Release tarballs are available at:
744
The Bloom filter used for path limited history traversal was broken
745
on systems whose "char" is unsigned; update the implementation and
746
bump the format version to 2.
546
-
547
- Expecting a reroll.
548
- cf. <c7b66d2c-cdc3-1f0f-60a0-a2ee21c277bf@github.com>
549
- source: <cover.1686677910.git.jonathantanmy@google.com>
550
-
551
-
552
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
553
- - cherry-pick: refuse cherry-pick sequence if index is dirty
554
-
555
- "git cherry-pick A" that replays a single commit stopped before
556
- clobbering local modification, but "git cherry-pick A..B" did not,
557
- which has been corrected.
558
-
559
- Expecting a reroll.
560
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
561
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
747
+ source: <cover.1689283789.git.jonathantanmy@google.com>
748
749
750
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
@@ -615,4 +801,5 @@ Release tarballs are available at:
801
- replay: introduce new builtin
802
- t6429: remove switching aspects of fast-rebase
803
804
+ What's the status of this thing?
805
source: <20230602102533.876905-1-christian.couder@gmail.com>