What's cooking (2023/03 #04)
Junio C Hamano committed
Mar 17, 2023 at 14:31 UTC
6a09177ebd7b6a23cba74de5df3dec6183ab369f
1 file changed
+364
-280
whats-cooking.txt
+364
-280
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2023, #03; Mon, 13)
3
-X-master-at: 73876f4861cd3d187a4682290ab75c9dccadbc56
4
-X-next-at: 60544f874fd51e4f7a5848f94bc42e74e5323d6a
2
+Subject: What's cooking in git.git (Mar 2023, #04; Fri, 17)
3
+X-master-at: 950264636c68591989456e3ba0a5442f93152c1a
4
+X-next-at: d9ab777d41f92a8c1684c91cfb02053d7dd1046b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2023, #03; Mon, 13)
7
+What's cooking in git.git (Mar 2023, #04; Fri, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,11 +16,9 @@ message that raises issues but they are no means exhaustive. A
16
topic without enough support may be discarded after a long period of
17
no activity.
18
19
-Git 2.40 (final) has been tagged and pushed out and we have about
20
-two dozens of topics in 'next'. Let's spend this week to look for
21
-regression reports and fix them, and to decide which ones to eject
22
-out of 'next' as necessary. I'll start moving stalled topics into
23
-to-be-discarded bin and discard them.
19
+The first batch of topics are in 'master' for the next feature
20
+release, and the tip of 'maint' now points at Git 2.40.0 to start
21
+another maintenance track.
22
23
Copies of the source code to Git live in many repositories, and the
24
following is a list of the ones I push into or their mirrors. Some
@@ -51,111 +49,267 @@ Release tarballs are available at:
49
https://www.kernel.org/pub/software/scm/git/
50
51
--------------------------------------------------
54
-[New Topics]
52
+[Graduated to 'master']
53
56
-* ab/fix-strategy-opts-parsing (2023-03-08) 1 commit
57
- (merged to 'next' on 2023-03-08 at bd9eff2779)
58
- + sequencer.c: fix overflow & segfault in parse_strategy_opts()
54
+* en/dir-api-cleanup (2023-02-27) 13 commits
55
+ (merged to 'next' on 2023-02-27 at 434ac6b592)
56
+ + unpack-trees: add usage notices around df_conflict_entry
57
+ + unpack-trees: special case read-tree debugging as internal usage
58
+ + unpack-trees: rewrap a few overlong lines from previous patch
59
+ + unpack-trees: mark fields only used internally as internal
60
+ + unpack_trees: start splitting internal fields from public API
61
+ + sparse-checkout: avoid using internal API of unpack-trees, take 2
62
+ + sparse-checkout: avoid using internal API of unpack-trees
63
+ + unpack-trees: clean up some flow control
64
+ + dir: mark output only fields of dir_struct as such
65
+ + dir: add a usage note to exclude_per_dir
66
+ + dir: separate public from internal portion of dir_struct
67
+ + unpack-trees: heed requests to overwrite ignored files
68
+ + t2021: fix platform-specific leftover cruft
69
60
- The code to parse "git rebase -X<opt>" was not prepared to see an
61
- unparsable option string, which has been corrected.
70
+ Code clean-up to clarify directory traversal API.
71
+ source: <pull.1149.v3.git.1677511700.gitgitgadget@gmail.com>
72
63
- Will cook in 'next'.
64
- source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@gmail.com>
73
74
+* en/header-cleanup (2023-02-23) 17 commits
75
+ (merged to 'next' on 2023-02-27 at f4a3707530)
76
+ + diff.h: remove unnecessary include of object.h
77
+ + Remove unnecessary includes of builtin.h
78
+ + treewide: replace cache.h with more direct headers, where possible
79
+ + replace-object.h: move read_replace_refs declaration from cache.h to here
80
+ + object-store.h: move struct object_info from cache.h
81
+ + dir.h: refactor to no longer need to include cache.h
82
+ + object.h: stop depending on cache.h; make cache.h depend on object.h
83
+ + ident.h: move ident-related declarations out of cache.h
84
+ + pretty.h: move has_non_ascii() declaration from commit.h
85
+ + cache.h: remove dependence on hex.h; make other files include it explicitly
86
+ + hex.h: move some hex-related declarations from cache.h
87
+ + hash.h: move some oid-related declarations from cache.h
88
+ + alloc.h: move ALLOC_GROW() functions from cache.h
89
+ + treewide: remove unnecessary cache.h includes in source files
90
+ + treewide: remove unnecessary cache.h includes
91
+ + treewide: remove unnecessary git-compat-util.h includes in headers
92
+ + treewide: ensure one of the appropriate headers is sourced first
93
67
-* ew/fetch-no-write-fetch-head-fix (2023-03-09) 1 commit
68
- (merged to 'next' on 2023-03-09 at 283e2159c8)
69
- + fetch: pass --no-write-fetch-head to subprocesses
94
+ Code clean-up to clarify the rule that "git-compat-util.h" must be
95
+ the first to be included.
96
+ source: <pull.1485.v2.git.1677197376.gitgitgadget@gmail.com>
97
71
- Will cook in 'next'.
72
- source: <20230308222205.M679514@dcvr>
98
99
+* ew/fetch-hiderefs (2023-02-27) 1 commit
100
+ (merged to 'next' on 2023-03-01 at 6a7eece733)
101
+ + fetch: support hideRefs to speed up connectivity checks
102
75
-* fc/advice-diverged-history (2023-03-08) 1 commit
76
- (merged to 'next' on 2023-03-08 at 30e7016218)
77
- + advice: add diverging advice for novices
103
+ A new "fetch.hideRefs" option can be used to exclude specified refs
104
+ from "rev-list --objects --stdin --not --all" traversal for
105
+ checking object connectivity, most useful when there are many
106
+ unrelated histories in a single repository.
107
+ source: <20230212090426.M558990@dcvr>
108
79
- After "git pull" that is configured with pull.rebase=false
80
- merge.ff=only fails due to our end having our own development, give
81
- advice messages to get out of the "Not possible to fast-forward"
82
- state.
109
84
- Will cook in 'next'.
85
- source: <20230308024834.1562386-2-felipe.contreras@gmail.com>
110
+* fz/rebase-msg-update (2023-02-27) 1 commit
111
+ (merged to 'next' on 2023-03-01 at f28c0df111)
112
+ + rebase: fix capitalisation autoSquash in i18n string
113
114
+ Message update.
115
+ source: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com>
116
88
-* jk/add-p-unmerged-fix (2023-03-09) 1 commit
89
- (merged to 'next' on 2023-03-09 at a46443480c)
90
- + add-patch: handle "* Unmerged path" lines
117
92
- "git add -p" while the index is unmerged sometimes failed to parse
93
- the diff output it internally produces and died, which has been
94
- corrected.
118
+* jc/gpg-lazy-init (2023-02-27) 2 commits
119
+ (merged to 'next' on 2023-02-27 at e3f81cfdbc)
120
+ + drop pure pass-through config callbacks
121
+ + gpg-interface: lazily initialize and read the configuration
122
96
- Will cook in 'next'.
97
- source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
123
+ Instead of forcing each command to choose to honor GPG related
124
+ configuration variables, make the subsystem lazily initialize
125
+ itself.
126
+ source: <xmqqpmaimvtd.fsf_-_@gitster.g>
127
128
100
-* jk/format-patch-ignore-noprefix (2023-03-09) 5 commits
101
- (merged to 'next' on 2023-03-12 at 621d71c151)
102
- + format-patch: add format.noprefix option
103
- + format-patch: do not respect diff.noprefix
104
- + diff: add --default-prefix option
105
- + t4013: add tests for diff prefix options
106
- + diff: factor out src/dst prefix setup
129
+* jk/fsck-indices-in-worktrees (2023-02-27) 4 commits
130
+ (merged to 'next' on 2023-02-27 at 6eb92abb6b)
131
+ + fsck: check even zero-entry index files
132
+ (merged to 'next' on 2023-02-24 at 38c0793286)
133
+ + fsck: mention file path for index errors
134
+ + fsck: check index files in all worktrees
135
+ + fsck: factor out index fsck
136
108
- "git format-patch" honors the src/dst prefixes set to nonstandard
109
- values with configuration variables like "diff.noprefix", causing
110
- receiving end of the patch that expects the standard -p1 format to
111
- break. Teach "format-patch" to ignore end-user configuration and
112
- always use the standard prefixes.
137
+ "git fsck" learned to check the index files in other worktrees,
138
+ just like "git gc" honors them as anchoring points.
139
+ source: <Y/hv0MXAyBY3HEo9@coredump.intra.peff.net>
140
114
- This is a backward compatibility breaking change.
141
116
- Will merge to 'master'.
117
- source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
142
+* jk/unused-post-2.39-part2 (2023-02-24) 21 commits
143
+ (merged to 'next' on 2023-02-27 at f0ec2a81b3)
144
+ + help: mark unused parameter in git_unknown_cmd_config()
145
+ + run_processes_parallel: mark unused callback parameters
146
+ + userformat_want_item(): mark unused parameter
147
+ + for_each_commit_graft(): mark unused callback parameter
148
+ + rewrite_parents(): mark unused callback parameter
149
+ + fetch-pack: mark unused parameter in callback function
150
+ + notes: mark unused callback parameters
151
+ + prio-queue: mark unused parameters in comparison functions
152
+ + for_each_object: mark unused callback parameters
153
+ + list-objects: mark unused callback parameters
154
+ + mark unused parameters in signal handlers
155
+ + run-command: mark error routine parameters as unused
156
+ + mark "pointless" data pointers in callbacks
157
+ + ref-filter: mark unused callback parameters
158
+ + http-backend: mark unused parameters in virtual functions
159
+ + http-backend: mark argc/argv unused
160
+ + object-name: mark unused parameters in disambiguate callbacks
161
+ + serve: mark unused parameters in virtual functions
162
+ + serve: use repository pointer to get config
163
+ + ls-refs: drop config caching
164
+ + ref-filter: drop unused atom parameter from get_worktree_path()
165
166
+ More work towards -Wunused.
167
+ source: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
168
120
-* sl/diff-files-sparse (2023-03-09) 2 commits
121
- - diff-files: integrate with sparse index
122
- - t1092: add tests for `git diff-files`
169
124
- Teach "diff-files" not to expand sparse-index unless needed.
170
+* mc/credential-helper-www-authenticate (2023-02-27) 3 commits
171
+ (merged to 'next' on 2023-02-27 at 89c9bd4b8f)
172
+ + credential: add WWW-Authenticate header to cred requests
173
+ + http: read HTTP WWW-Authenticate response headers
174
+ + t5563: add tests for basic and anoymous HTTP access
175
126
- Expecting hopefully a final and minor reroll?
127
- source: <20230309063952.42362-1-cheskaqiqi@gmail.com>
176
+ Allow information carried on the WWW-AUthenticate header to be
177
+ passed to the credential helpers.
178
+ source: <pull.1352.v11.git.1677518420.gitgitgadget@gmail.com>
179
180
+--------------------------------------------------
181
+[New Topics]
182
130
-* aj/ls-files-format-fix (2023-03-10) 1 commit
131
- - ls-files: fix "--format" output of relative paths
183
+* ar/test-cleanup-unused-file-creation (2023-03-13) 7 commits
184
+ - t1507: assert output of rev-parse
185
+ - t1404: don't create unused file
186
+ - t1400: assert output of update-ref
187
+ - t1302: don't create unused file
188
+ - t1010: assert empty output of mktree
189
+ - t1006: assert error output of cat-file
190
+ - t1005: assert output of ls-files
191
133
- Fix for a "ls-files --format="%(path)" that produced nonsense
134
- output, which was a bug in 2.38.
192
+ Test clean-up.
193
136
- Will merge to 'next'.
137
- source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
194
+ Needs Review.
195
+ source: <20230312201520.370234-1-rybak.a.v@gmail.com>
196
197
140
-* fc/test-aggregation-clean-up (2023-03-09) 2 commits
141
- - test: don't print aggregate-results command
142
- - test: simplify counts aggregation
198
+* nw/for-each-ref-signature (2023-03-13) 1 commit
199
+ . ref-filter: add new "signature" atom
200
144
- Code clean-up for test framework.
201
+ "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
202
+ placeholder and friends.
203
+
204
+ Breaks CI.
205
+ cf. <xmqqpm9bosjw.fsf@gitster.g>
206
+ source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
207
+
208
+
209
+* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
210
+ - credential: new attribute oauth_refresh_token
211
+
212
+ The credential subsystem learns to help OAuth framework.
213
+
214
+ Needs Review.
215
+ source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
216
+
217
+
218
+* mh/credential-password-expiry-libsecret (2023-03-14) 1 commit
219
+ - credential/libsecret: support password_expiry_utc
220
+
221
+ The libsecret credential helper learns to handle the password
222
+ expiry time information.
223
+
224
+ Needs Review.
225
+ source: <pull.1469.git.git.1678829531648.gitgitgadget@gmail.com>
226
+
227
+
228
+* ps/fetch-ref-update-reporting (2023-03-15) 8 commits
229
+ - fetch: centralize printing of reference updates
230
+ - fetch: fix inconsistent summary width for pruned and updated refs
231
+ - fetch: deduplicate logic to print remote URL
232
+ - fetch: deduplicate handling of per-reference format
233
+ - fetch: pass the full local reference name to `format_display`
234
+ - fetch: move output format into `display_state`
235
+ - fetch: move reference width calculation into `display_state`
236
+ - fetch: rename `display` buffer to avoid name conflict
237
+
238
+ Clean-up of the code path that reports what "git fetch" did to each
239
+ ref.
240
+
241
+ Will merge to 'next'??
242
+ source: <cover.1678878623.git.ps@pks.im>
243
+
244
+
245
+* pw/rebase-cleanup-merge-strategy-option-handling (2023-03-15) 5 commits
246
+ - rebase: remove a couple of redundant strategy tests
247
+ - rebase -m: fix serialization of strategy options
248
+ - rebase -m: cleanup --strategy-option handling
249
+ - rebase: stop reading and writing unnecessary strategy state
250
+ - Merge branch 'ab/fix-strategy-opts-parsing'
251
+ (this branch uses ab/fix-strategy-opts-parsing.)
252
+
253
+ Clean-up of the code path that deals with merge strategy option
254
+ handling in "git rebase".
255
+
256
+ Needs review.
257
+ source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
258
+
259
+
260
+* ab/remove-implicit-use-of-the-repository (2023-03-17) 17 commits
261
+ - libs: use "struct repository *" argument, not "the_repository"
262
+ - post-cocci: adjust comments for recent repo_* migration
263
+ - cocci: apply the "revision.h" part of "the_repository.pending"
264
+ - cocci: apply the "rerere.h" part of "the_repository.pending"
265
+ - cocci: apply the "refs.h" part of "the_repository.pending"
266
+ - cocci: apply the "promisor-remote.h" part of "the_repository.pending"
267
+ - cocci: apply the "packfile.h" part of "the_repository.pending"
268
+ - cocci: apply the "pretty.h" part of "the_repository.pending"
269
+ - cocci: apply the "object-store.h" part of "the_repository.pending"
270
+ - cocci: apply the "diff.h" part of "the_repository.pending"
271
+ - cocci: apply the "commit.h" part of "the_repository.pending"
272
+ - cocci: apply the "commit-reach.h" part of "the_repository.pending"
273
+ - cocci: apply the "cache.h" part of "the_repository.pending"
274
+ - cocci: add missing "the_repository" macros to "pending"
275
+ - cocci: sort "the_repository" rules by header
276
+ - cocci: fix incorrect & verbose "the_repository" rules
277
+ - cocci: remove dead rule from "the_repository.pending.cocci"
278
+
279
+ Code clean-up around the use of the_repository.
280
+
281
+ Needs review.
282
+ source: <cover-00.17-00000000000-20230317T152724Z-avarab@gmail.com>
283
+
284
+
285
+* fc/completion-colors-do-not-need-prompt-command (2023-03-16) 1 commit
286
+ - completion: prompt: use generic colors
287
+
288
+ Lift the limitation that colored prompts can only be used with
289
+ PROMPT_COMMAND mode.
290
291
Will merge to 'next'.
147
- source: <20230309173032.959968-1-felipe.contreras@gmail.com>
292
+ < source: <20230228145934.4182166-1-felipe.contreras@gmail.com>
293
294
150
-* ps/receive-pack-unlock-before-die (2023-03-10) 1 commit
151
- - receive-pack: fix stale packfile locks when dying
295
+* fc/oid-quietly-parse-upstream (2023-03-16) 1 commit
296
+ - object-name: fix quiet @{u} parsing
297
153
- "git receive-pack" that responds to "git push" requests failed to
154
- clean a stale lockfile when killed in the middle, which has been
155
- corrected.
298
+ "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
299
+ parsed with GET_OID_QUIETLY option, did not quietly fail, which has
300
+ been corrected.
301
302
Will merge to 'next'.
158
- source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
303
+ source: <20230316171514.23741-1-felipe.contreras@gmail.com>
304
+
305
+
306
+* jk/unused-post-2.40 (2023-03-17) 4 commits
307
+ - transport: mark unused parameters in fetch_refs_from_bundle()
308
+ - http: mark unused parameter in fill_active_slot() callbacks
309
+ - http: drop unused parameter from start_object_request()
310
+ - mailmap: drop debugging code
311
+
312
+ source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
313
314
--------------------------------------------------
315
[Stalled]
@@ -251,17 +405,130 @@ Release tarballs are available at:
405
--------------------------------------------------
406
[Cooking]
407
408
+* ab/fix-strategy-opts-parsing (2023-03-08) 1 commit
409
+ (merged to 'next' on 2023-03-08 at bd9eff2779)
410
+ + sequencer.c: fix overflow & segfault in parse_strategy_opts()
411
+ (this branch is used by pw/rebase-cleanup-merge-strategy-option-handling.)
412
+
413
+ The code to parse "git rebase -X<opt>" was not prepared to see an
414
+ unparsable option string, which has been corrected.
415
+
416
+ Will merge to 'master'.
417
+ source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@gmail.com>
418
+
419
+
420
+* ew/fetch-no-write-fetch-head-fix (2023-03-09) 1 commit
421
+ (merged to 'next' on 2023-03-09 at 283e2159c8)
422
+ + fetch: pass --no-write-fetch-head to subprocesses
423
+
424
+ Will merge to 'master'.
425
+ source: <20230308222205.M679514@dcvr>
426
+
427
+
428
+* fc/advice-diverged-history (2023-03-08) 1 commit
429
+ (merged to 'next' on 2023-03-08 at 30e7016218)
430
+ + advice: add diverging advice for novices
431
+
432
+ After "git pull" that is configured with pull.rebase=false
433
+ merge.ff=only fails due to our end having our own development, give
434
+ advice messages to get out of the "Not possible to fast-forward"
435
+ state.
436
+
437
+ Will merge to 'master'.
438
+ source: <20230308024834.1562386-2-felipe.contreras@gmail.com>
439
+
440
+
441
+* jk/add-p-unmerged-fix (2023-03-09) 1 commit
442
+ (merged to 'next' on 2023-03-09 at a46443480c)
443
+ + add-patch: handle "* Unmerged path" lines
444
+
445
+ "git add -p" while the index is unmerged sometimes failed to parse
446
+ the diff output it internally produces and died, which has been
447
+ corrected.
448
+
449
+ Will merge to 'master'.
450
+ source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
451
+
452
+
453
+* jk/format-patch-ignore-noprefix (2023-03-13) 6 commits
454
+ (merged to 'next' on 2023-03-13 at 4b28e389f5)
455
+ + rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
456
+ (merged to 'next' on 2023-03-12 at 621d71c151)
457
+ + format-patch: add format.noprefix option
458
+ + format-patch: do not respect diff.noprefix
459
+ + diff: add --default-prefix option
460
+ + t4013: add tests for diff prefix options
461
+ + diff: factor out src/dst prefix setup
462
+
463
+ "git format-patch" honors the src/dst prefixes set to nonstandard
464
+ values with configuration variables like "diff.noprefix", causing
465
+ receiving end of the patch that expects the standard -p1 format to
466
+ break. Teach "format-patch" to ignore end-user configuration and
467
+ always use the standard prefixes.
468
+
469
+ This is a backward compatibility breaking change.
470
+
471
+ Will merge to 'master'.
472
+ source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
473
+
474
+
475
+* sl/diff-files-sparse (2023-03-09) 2 commits
476
+ - diff-files: integrate with sparse index
477
+ - t1092: add tests for `git diff-files`
478
+
479
+ Teach "diff-files" not to expand sparse-index unless needed.
480
+
481
+ Expecting hopefully a final and minor reroll?
482
+ source: <20230309063952.42362-1-cheskaqiqi@gmail.com>
483
+
484
+
485
+* aj/ls-files-format-fix (2023-03-10) 1 commit
486
+ (merged to 'next' on 2023-03-13 at 27f876afa4)
487
+ + ls-files: fix "--format" output of relative paths
488
+
489
+ Fix for a "ls-files --format="%(path)" that produced nonsense
490
+ output, which was a bug in 2.38.
491
+
492
+ Will merge to 'master'.
493
+ source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
494
+
495
+
496
+* fc/test-aggregation-clean-up (2023-03-09) 2 commits
497
+ (merged to 'next' on 2023-03-13 at f938b09366)
498
+ + test: don't print aggregate-results command
499
+ + test: simplify counts aggregation
500
+
501
+ Code clean-up for test framework.
502
+
503
+ Will merge to 'master'.
504
+ source: <20230309173032.959968-1-felipe.contreras@gmail.com>
505
+
506
+
507
+* ps/receive-pack-unlock-before-die (2023-03-10) 1 commit
508
+ (merged to 'next' on 2023-03-13 at 8d099dffcc)
509
+ + receive-pack: fix stale packfile locks when dying
510
+
511
+ "git receive-pack" that responds to "git push" requests failed to
512
+ clean a stale lockfile when killed in the middle, which has been
513
+ corrected.
514
+
515
+ Will merge to 'master'.
516
+ source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
517
+
518
+
519
* as/doc-markup-fix (2023-03-06) 1 commit
520
(merged to 'next' on 2023-03-07 at 8c7289659a)
521
+ git-merge-tree.txt: replace spurious HTML entity
522
523
Fix for a mis-mark-up in doc made in Git 2.39 days.
524
260
- Will cook in 'next'.
525
+ Will merge to 'master'.
526
source: <87y1oco3i9.fsf@igel.home>
527
528
264
-* ds/ahead-behind (2023-03-10) 7 commits
529
+* ds/ahead-behind (2023-03-15) 9 commits
530
+ - SQUASH??? leak fix (spotted by Peff)
531
+ - commit-reach: add tips_reachable_from_bases()
532
- for-each-ref: add ahead-behind format atom
533
- commit-reach: implement ahead_behind() logic
534
- commit-graph: introduce `ensure_generations_valid()`
@@ -275,21 +542,23 @@ Release tarballs are available at:
542
of commits in bulk.
543
544
Will merge to 'next'?
278
- source: <pull.1489.v2.git.1678468863.gitgitgadget@gmail.com>
545
+ source: <pull.1489.v3.git.1678902343.gitgitgadget@gmail.com>
546
547
281
-* gc/config-parsing-cleanup (2023-03-03) 6 commits
548
+* gc/config-parsing-cleanup (2023-03-15) 8 commits
549
+ - config.c: rename "struct config_source cf"
550
+ - config: report cached filenames in die_bad_number()
551
- config.c: remove current_parsing_scope
552
- config.c: remove current_config_kvi
553
- config.c: plumb the_reader through callbacks
554
- config.c: create config_reader and the_reader
286
- - config.c: don't assign to "cf" directly
555
+ - config.c: don't assign to "cf_global" directly
556
- config.c: plumb config_source through static fns
557
558
Config API clean-up to reduce its dependence on static variables
559
560
Comments?
292
- source: <pull.1463.git.git.1677631097.gitgitgadget@gmail.com>
561
+ source: <pull.1463.v2.git.git.1678925506.gitgitgadget@gmail.com>
562
563
564
* jk/bundle-progress (2023-03-06) 1 commit
@@ -298,7 +567,7 @@ Release tarballs are available at:
567
568
Simplify UI to control progress meter given by "git bundle" command.
569
301
- Will cook in 'next'.
570
+ Will merge to 'master'.
571
source: <ZAMjkffYmp+DNmr+@coredump.intra.peff.net>
572
573
@@ -315,7 +584,7 @@ Release tarballs are available at:
584
standard output. It used to work only for output and only from the
585
root level of the working tree.
586
318
- Will cook in 'next'.
587
+ Will merge to 'master'.
588
source: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
589
590
@@ -326,7 +595,7 @@ Release tarballs are available at:
595
"git format-patch" learned to write a log-message only output file
596
for empty commits.
597
329
- Will cook in 'next'.
598
+ Will merge to 'master'.
599
source: <20230303160301.3659328-1-john@keeping.me.uk>
600
601
@@ -339,7 +608,7 @@ Release tarballs are available at:
608
update the list of packfiles during runtime to update this list as
609
well.
610
342
- Will cook in 'next'.
611
+ Will merge to 'master'.
612
source: <pull.1490.v2.git.1678301252360.gitgitgadget@gmail.com>
613
614
@@ -353,23 +622,10 @@ Release tarballs are available at:
622
marked to be incompatible when both "--staged" and "--worktree" are
623
in effect.
624
356
- Will cook in 'next'.
625
+ Will merge to 'master'.
626
source: <20230226184354.221-1-andy.koppe@gmail.com>
627
628
360
-* ew/fetch-hiderefs (2023-02-27) 1 commit
361
- (merged to 'next' on 2023-03-01 at 6a7eece733)
362
- + fetch: support hideRefs to speed up connectivity checks
363
-
364
- A new "fetch.hideRefs" option can be used to exclude specified refs
365
- from "rev-list --objects --stdin --not --all" traversal for
366
- checking object connectivity, most useful when there are many
367
- unrelated histories in a single repository.
368
-
369
- Will cook in 'next'.
370
- source: <20230212090426.M558990@dcvr>
371
-
372
-
629
* zh/push-to-delete-onelevel-ref (2023-03-01) 2 commits
630
(merged to 'next' on 2023-03-06 at f08def5949)
631
+ push: allow delete single-level ref
@@ -380,20 +636,10 @@ Release tarballs are available at:
636
mistake. In general, we don't encourage use of such a ref, and
637
creation or update to such a ref is rejected as before.
638
383
- Will cook in 'next'.
639
+ Will merge to 'master'.
640
source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
641
642
387
-* fz/rebase-msg-update (2023-02-27) 1 commit
388
- (merged to 'next' on 2023-03-01 at f28c0df111)
389
- + rebase: fix capitalisation autoSquash in i18n string
390
-
391
- Message update.
392
-
393
- Will cook in 'next'.
394
- source: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com>
395
-
396
-
643
* my/wildmatch-cleanups (2023-02-27) 5 commits
644
- wildmatch: more cleanups after killing uchar
645
- wildmatch: use char instead of uchar
@@ -422,7 +668,7 @@ Release tarballs are available at:
668
source: <20230228185253.2356546-1-calvinwan@google.com>
669
670
425
-* ah/rebase-merges-config (2023-03-06) 3 commits
671
+* ah/rebase-merges-config (2023-03-13) 3 commits
672
- rebase: add a config option for --rebase-merges
673
- rebase: deprecate --rebase-merges=""
674
- rebase: add documentation and test for --no-rebase-merges
@@ -431,102 +677,7 @@ Release tarballs are available at:
677
introduce rebase.merges configuration variable.
678
679
On hold.
434
- cf. <b4be9cb3-c24b-4377-bab3-5d53035efdf8@gmx.de>
435
- source: <20230305050709.68736-1-alexhenrie24@gmail.com>
436
-
437
-
438
-* en/dir-api-cleanup (2023-02-27) 13 commits
439
- (merged to 'next' on 2023-02-27 at 434ac6b592)
440
- + unpack-trees: add usage notices around df_conflict_entry
441
- + unpack-trees: special case read-tree debugging as internal usage
442
- + unpack-trees: rewrap a few overlong lines from previous patch
443
- + unpack-trees: mark fields only used internally as internal
444
- + unpack_trees: start splitting internal fields from public API
445
- + sparse-checkout: avoid using internal API of unpack-trees, take 2
446
- + sparse-checkout: avoid using internal API of unpack-trees
447
- + unpack-trees: clean up some flow control
448
- + dir: mark output only fields of dir_struct as such
449
- + dir: add a usage note to exclude_per_dir
450
- + dir: separate public from internal portion of dir_struct
451
- + unpack-trees: heed requests to overwrite ignored files
452
- + t2021: fix platform-specific leftover cruft
453
-
454
- Code clean-up to clarify directory traversal API.
455
-
456
- Will cook in 'next'.
457
- source: <pull.1149.v3.git.1677511700.gitgitgadget@gmail.com>
458
-
459
-
460
-* en/header-cleanup (2023-02-23) 17 commits
461
- (merged to 'next' on 2023-02-27 at f4a3707530)
462
- + diff.h: remove unnecessary include of object.h
463
- + Remove unnecessary includes of builtin.h
464
- + treewide: replace cache.h with more direct headers, where possible
465
- + replace-object.h: move read_replace_refs declaration from cache.h to here
466
- + object-store.h: move struct object_info from cache.h
467
- + dir.h: refactor to no longer need to include cache.h
468
- + object.h: stop depending on cache.h; make cache.h depend on object.h
469
- + ident.h: move ident-related declarations out of cache.h
470
- + pretty.h: move has_non_ascii() declaration from commit.h
471
- + cache.h: remove dependence on hex.h; make other files include it explicitly
472
- + hex.h: move some hex-related declarations from cache.h
473
- + hash.h: move some oid-related declarations from cache.h
474
- + alloc.h: move ALLOC_GROW() functions from cache.h
475
- + treewide: remove unnecessary cache.h includes in source files
476
- + treewide: remove unnecessary cache.h includes
477
- + treewide: remove unnecessary git-compat-util.h includes in headers
478
- + treewide: ensure one of the appropriate headers is sourced first
479
-
480
- Code clean-up to clarify the rule that "git-compat-util.h" must be
481
- the first to be included.
482
-
483
- Will cook in 'next'.
484
- source: <pull.1485.v2.git.1677197376.gitgitgadget@gmail.com>
485
-
486
-
487
-* jk/fsck-indices-in-worktrees (2023-02-27) 4 commits
488
- (merged to 'next' on 2023-02-27 at 6eb92abb6b)
489
- + fsck: check even zero-entry index files
490
- (merged to 'next' on 2023-02-24 at 38c0793286)
491
- + fsck: mention file path for index errors
492
- + fsck: check index files in all worktrees
493
- + fsck: factor out index fsck
494
-
495
- "git fsck" learned to check the index files in other worktrees,
496
- just like "git gc" honors them as anchoring points.
497
-
498
- Will cook in 'next'.
499
- source: <Y/hv0MXAyBY3HEo9@coredump.intra.peff.net>
500
-
501
-
502
-* jk/unused-post-2.39-part2 (2023-02-24) 21 commits
503
- (merged to 'next' on 2023-02-27 at f0ec2a81b3)
504
- + help: mark unused parameter in git_unknown_cmd_config()
505
- + run_processes_parallel: mark unused callback parameters
506
- + userformat_want_item(): mark unused parameter
507
- + for_each_commit_graft(): mark unused callback parameter
508
- + rewrite_parents(): mark unused callback parameter
509
- + fetch-pack: mark unused parameter in callback function
510
- + notes: mark unused callback parameters
511
- + prio-queue: mark unused parameters in comparison functions
512
- + for_each_object: mark unused callback parameters
513
- + list-objects: mark unused callback parameters
514
- + mark unused parameters in signal handlers
515
- + run-command: mark error routine parameters as unused
516
- + mark "pointless" data pointers in callbacks
517
- + ref-filter: mark unused callback parameters
518
- + http-backend: mark unused parameters in virtual functions
519
- + http-backend: mark argc/argv unused
520
- + object-name: mark unused parameters in disambiguate callbacks
521
- + serve: mark unused parameters in virtual functions
522
- + serve: use repository pointer to get config
523
- + ls-refs: drop config caching
524
- + ref-filter: drop unused atom parameter from get_worktree_path()
525
-
526
- More work towards -Wunused.
527
-
528
- Will cook in 'next'.
529
- source: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
680
+ source: <20230312210456.92364-1-alexhenrie24@gmail.com>
681
682
683
* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
@@ -536,7 +687,7 @@ Release tarballs are available at:
687
Fix a segfaulting loop. The function and its caller may need
688
further clean-up.
689
539
- Will cook in 'next'.
690
+ Will merge to 'master'.
691
cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
692
source: <20230211111526.2028178-1-e@80x24.org>
693
@@ -555,32 +706,6 @@ Release tarballs are available at:
706
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
707
708
558
-* jc/gpg-lazy-init (2023-02-27) 2 commits
559
- (merged to 'next' on 2023-02-27 at e3f81cfdbc)
560
- + drop pure pass-through config callbacks
561
- + gpg-interface: lazily initialize and read the configuration
562
-
563
- Instead of forcing each command to choose to honor GPG related
564
- configuration variables, make the subsystem lazily initialize
565
- itself.
566
-
567
- Will cook in 'next'.
568
- source: <xmqqpmaimvtd.fsf_-_@gitster.g>
569
-
570
-
571
-* mc/credential-helper-www-authenticate (2023-02-27) 3 commits
572
- (merged to 'next' on 2023-02-27 at 89c9bd4b8f)
573
- + credential: add WWW-Authenticate header to cred requests
574
- + http: read HTTP WWW-Authenticate response headers
575
- + t5563: add tests for basic and anoymous HTTP access
576
-
577
- Allow information carried on the WWW-AUthenticate header to be
578
- passed to the credential helpers.
579
-
580
- Will cook in 'next'.
581
- source: <pull.1352.v11.git.1677518420.gitgitgadget@gmail.com>
582
-
583
-
709
* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
710
(merged to 'next' on 2023-03-06 at 60d7d0d493)
711
+ tests: don't lose misc "git" exit codes
@@ -592,7 +717,7 @@ Release tarballs are available at:
717
718
Test clean-up.
719
595
- Will cook in 'next'.
720
+ Will merge to 'master'.
721
source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
722
723
@@ -667,7 +792,7 @@ Release tarballs are available at:
792
branch that is being used in another worktree linked to the same
793
repository.
794
670
- Will cook in 'next'.
795
+ Will merge to 'master'.
796
source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
797
798
@@ -679,7 +804,7 @@ Release tarballs are available at:
804
branch is already checked out in a different worktree linked to the
805
same repository.
806
682
- Will cook in 'next'.
807
+ Will merge to 'master'.
808
source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
809
810
@@ -721,44 +846,3 @@ Release tarballs are available at:
846
847
Comments?
848
source: <20230302215237.1473444-1-calvinwan@google.com>
724
-
725
---------------------------------------------------
726
-[Discarded]
727
-
728
-* mc/switch-advice (2022-11-09) 1 commit
729
- . po: use `switch` over `checkout` in error message
730
-
731
- Use 'switch' instead of 'checkout' in an error message.
732
-
733
- Will discard.
734
- Getting tired of waiting for review response.
735
-
736
-
737
-* js/range-diff-mbox (2022-11-23) 1 commit
738
- . range-diff: support reading mbox files
739
-
740
- 'git range-diff' gained support for reading either side from an .mbox
741
- file instead of a revision range.
742
-
743
- Will discard.
744
- Getting tired of waiting for review response.
745
- cf. <xmqqr0xupmnf.fsf@gitster.g>
746
- source: <pull.1420.v3.git.1669108102092.gitgitgadget@gmail.com>
747
-
748
-
749
-* jc/test-prereq-symlink-update (2023-02-09) 1 commit
750
- . test: make SYMLINKS prerequisite more robust
751
-
752
- For some reason, "ln -s x y && test -h y" started passing on
753
- Windows, even though we do not have working readlink(3) there.
754
- Tighten the check to enable SYMLINKS prerequisite in our tests.
755
-
756
- It turns out that this was caused by using a faulty build of the
757
- Windows dev environment, which was fixed.
758
- source: <xmqqwn4sq73f.fsf@gitster.g>
759
-
760
-
761
-* jc/t5559-workaround (2023-02-09) 1 commit
762
- . t5559: skip a known-to-be-broken test
763
-
764
- source: <xmqq357ems2h.fsf@gitster.g>