What's cooking (2024/11 #10)
Junio C Hamano committed
Nov 28, 2024 at 11:32 UTC
c8d5b50b6c5c1637931c51d675412910af95ee26
1 file changed
+233
-172
whats-cooking.txt
+233
-172
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2024, #09; Mon, 25)
3
-X-master-at: 6ea2d9d271a56afa0e77cd45796ea0592aa9c2d4
4
-X-next-at: dd8b44aac527cac716a395b3fa3356e4ab8b63dd
2
+Subject: What's cooking in git.git (Nov 2024, #10; Thu, 28)
3
+X-master-at: cc01bad4a9f566cf4453c7edd6b433851b0835e2
4
+X-next-at: 84693f6bb70175a83151ae9668127e1308f434b4
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2024, #09; Mon, 25)
7
+What's cooking in git.git (Nov 2024, #10; Thu, 28)
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
-Git 2.47.1 has been tagged; its primary purpose is to synchronise
21
-the gitk subtree with that of J6t, the new maintainer of gitk.
22
-Thanks Johaness for volunteering.
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,38 +45,183 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* bc/c23 (2024-11-18) 2 commits
52
+ (merged to 'next' on 2024-11-20 at bd29255bf3)
53
+ + reflog: rename unreachable
54
+ + index-pack: rename struct thread_local
55
+
56
+ C23 compatibility updates.
57
+ source: <20241117013149.576671-1-sandals@crustytoothpaste.net>
58
+
59
+
60
+* en/fast-import-avoid-self-replace (2024-11-19) 1 commit
61
+ (merged to 'next' on 2024-11-20 at 751ee6b395)
62
+ + fast-import: avoid making replace refs point to themselves
63
+
64
+ "git fast-import" can be tricked into a replace ref that maps an
65
+ object to itself, which is a useless thing to do.
66
+ source: <pull.1824.v2.git.1731968389590.gitgitgadget@gmail.com>
67
+
68
+
69
+* jk/gcc15 (2024-11-18) 6 commits
70
+ (merged to 'next' on 2024-11-20 at fa92bcdeb9)
71
+ + object-file: inline empty tree and blob literals
72
+ + object-file: treat cached_object values as const
73
+ + object-file: drop oid field from find_cached_object() return value
74
+ + object-file: move empty_tree struct into find_cached_object()
75
+ + object-file: drop confusing oid initializer of empty_tree struct
76
+ + object-file: prefer array-of-bytes initializer for hash literals
77
+
78
+ GCC 15 compatibility updates.
79
+ source: <20241118095423.GA3990835@coredump.intra.peff.net>
80
+
81
+
82
+* jt/index-pack-allow-promisor-only-while-fetching (2024-11-20) 1 commit
83
+ (merged to 'next' on 2024-11-20 at 9bd7657760)
84
+ + index-pack: teach --promisor to forbid pack name
85
+
86
+ We now ensure "index-pack" is used with the "--promisor" option
87
+ only during a "git fetch".
88
+ source: <20241119201016.22713-1-jonathantanmy@google.com>
89
+
90
+
91
+* kh/bundle-docs (2024-11-18) 4 commits
92
+ (merged to 'next' on 2024-11-20 at d70c2c32ce)
93
+ + Documentation/git-bundle.txt: discuss naïve backups
94
+ + Documentation/git-bundle.txt: mention --all in spec. refs
95
+ + Documentation/git-bundle.txt: remove old `--all` example
96
+ + Documentation/git-bundle.txt: mention full backup example
97
+
98
+ Documentation for "git bundle" saw improvements to more prominently
99
+ call out the use of '--all' when creating bundles.
100
+ source: <cover.1731768344.git.code@khaugsbakk.name>
101
+
102
+
103
+* kh/trailer-in-glossary (2024-11-18) 1 commit
104
+ (merged to 'next' on 2024-11-20 at fad433e2f4)
105
+ + Documentation/glossary: describe "trailer"
106
+
107
+ Doc updates.
108
+ source: <ba35ba3ec212860a3151cfad582a384a50c55e6a.1731871683.git.code@khaugsbakk.name>
109
+
110
+
111
+* kn/ref-transaction-hook-with-reflog (2024-11-15) 1 commit
112
+ (merged to 'next' on 2024-11-20 at 23399887d7)
113
+ + refs: don't invoke reference-transaction hook for reflogs
114
+
115
+ The ref-transaction hook triggered for reflog updates, which has
116
+ been corrected.
117
+ source: <20241114-348-do-not-call-the-reference-transaction-hooks-for-reflogs-v1-1-ece7260ee3c1@gmail.com>
118
+
119
+
120
+* ps/clar-build-improvement (2024-11-18) 4 commits
121
+ (merged to 'next' on 2024-11-20 at d88840a15d)
122
+ + Makefile: let clar header targets depend on their scripts
123
+ + cmake: use verbatim arguments when invoking clar commands
124
+ + cmake: use SH_EXE to execute clar scripts
125
+ + t/unit-tests: convert "clar-generate.awk" into a shell script
126
+ (this branch is used by ps/build.)
127
+
128
+ Fix for clar unit tests to support CMake build.
129
+ source: <20241115-pks-clar-build-improvements-v3-0-29672bf65ec6@pks.im>
130
+
131
--------------------------------------------------
132
[New Topics]
133
134
+* en/fast-import-verify-path (2024-11-28) 2 commits
135
+ - fast-import: disallow more path components
136
+ (merged to 'next' on 2024-11-27 at 8b145bb543)
137
+ + fast-import: disallow "." and ".." path components
138
+
139
+ "git fast-import" learned to reject paths with ".." and "." as
140
+ their components to avoid creating invalid tree objects.
141
+
142
+ Will merge to 'next'.
143
+ source: <pull.1831.v2.git.1732561248717.gitgitgadget@gmail.com>
144
+ source: <pull.1832.git.1732740464398.gitgitgadget@gmail.com>
145
+
146
+
147
+* kn/pass-repo-to-builtin-sub-sub-commands (2024-11-26) 1 commit
148
+ (merged to 'next' on 2024-11-27 at 668c0913f5)
149
+ + builtin: pass repository to sub commands
150
+ (this branch is used by kn/midx-wo-the-repository.)
151
+
152
+ Built-in Git subcommands are supplied the repository object to work
153
+ with; they learned to do the same when they invoke sub-subcommands.
154
+
155
+ Will merge to 'master'.
156
+ source: <20241125-374-add-repository-to-subsubcommands-v1-1-637a5e22ba48@gmail.com>
157
+
158
+
159
+* ps/bisect-double-free-fix (2024-11-26) 2 commits
160
+ (merged to 'next' on 2024-11-27 at e163bce018)
161
+ + bisect: address Coverity warning about potential double free
162
+ + Merge branch 'ps/leakfixes-part-10' into ps/bisect-double-free-fix
163
+ (this branch uses ps/leakfixes-part-10.)
164
+
165
+ Work around Coverity warning that would not trigger in practice.
166
+
167
+ Will merge to 'master'.
168
+ source: <20241125-pks-leak-fixes-address-double-free-v1-1-d33fd8ebf55b@pks.im>
169
+
170
+
171
+* sj/refs-symref-referent-fix (2024-11-27) 1 commit
172
+ (merged to 'next' on 2024-11-28 at 65eba16b56)
173
+ + ref-cache: fix invalid free operation in `free_ref_entry`
174
+
175
+ A double-free that may not trigger in practice by luck has been
176
+ corrected in the reference resolution code.
177
+
178
+ Will merge to 'master'.
179
+ source: <Z0Xd-cYPNNrxwuAB@ArchLinux>
180
+
181
+
182
+* bf/fetch-set-head-config (2024-11-27) 2 commits
183
+ - fetch: add configuration for set_head behaviour
184
+ - Merge branch 'bf/set-head-symref' into bf/fetch-set-head-config
185
+ (this branch uses bf/set-head-symref.)
186
+
187
+ source: <20241127091718.345541-1-bence@ferdinandy.com>
188
+
189
+
190
+* jc/doc-error-message-guidelines (2024-11-28) 1 commit
191
+ - CodingGuidelines: a handful of error message guidelines
192
+
193
+ source: <xmqq1pywvmhq.fsf_-_@gitster.g>
194
+
195
+--------------------------------------------------
196
+[Cooking]
197
+
198
* jc/doc-opt-tilde-expand (2024-11-25) 1 commit
199
- doc: option value may be separate for valid reasons
200
58
- Doc update.
201
+ Describe a case where an option value needs to be spelled as a
202
+ separate argument, i.e. "--opt val", not "--opt=val".
203
204
Will merge to 'next'.
205
source: <xmqqh67w6m4m.fsf@gitster.g>
206
63
---------------------------------------------------
64
-[Cooking]
207
66
-* kn/midx-wo-the-repository (2024-11-25) 11 commits
208
+* kn/midx-wo-the-repository (2024-11-28) 10 commits
209
- midx: inline the `MIDX_MIN_SIZE` definition
68
- - midx: pass down `hash_algo` to `get_split_midx_filename_ext`
69
- - midx: pass down `hash_algo` to `get_midx_filename[_ext]`
210
+ - midx: pass down `hash_algo` to functions using global variables
211
- midx: pass `repository` to `load_multi_pack_index`
212
- midx: cleanup internal usage of `the_repository` and `the_hash_algo`
213
- midx-write: pass down repository to `write_midx_file[_only]`
214
- write-midx: add repository field to `write_midx_context`
215
- midx-write: use `revs->repo` inside `read_refs_snapshot`
216
- midx-write: pass down repository to static functions
76
- - builtin: pass repository to sub commands
217
+ - Merge branch 'kn/pass-repo-to-builtin-sub-sub-commands' into kn/midx-wo-the-repository
218
- Merge branch 'kn/the-repository' into kn/midx-wo-the-repository
78
- (this branch uses kn/the-repository.)
219
+ (this branch uses kn/pass-repo-to-builtin-sub-sub-commands and kn/the-repository.)
220
221
Yet another "pass the repository through the callchain" topic.
222
82
- Expecting a reroll.
83
- source: <20241119-374-refactor-midx-c-and-midx-write-c-to-not-depend-on-global-state-v2-0-e2f607174efc@gmail.com>
223
+ Will merge to 'next'?
224
+ source: <20241127-374-refactor-midx-c-and-midx-write-c-to-not-depend-on-global-state-v3-0-c5a99f85009b@gmail.com>
225
226
227
* tb/unsafe-hash-test (2024-11-21) 2 commits
@@ -91,13 +232,13 @@ Release tarballs are available at:
232
algorithm without collision protection.
233
234
Comments?
235
+ cf. <xmqqr073antj.fsf@gitster.g>
236
source: <cover.1730833506.git.me@ttaylorr.com>
237
238
97
-* jt/bundle-fsck (2024-11-22) 5 commits
239
+* jt/bundle-fsck (2024-11-27) 4 commits
240
- transport: propagate fsck configuration during bundle fetch
99
- - fetch-pack: expose `fetch_pack_config_cb()`
100
- - fetch-pack: introduce `fetch_pack_options`
241
+ - fetch-pack: split out fsck config parsing
242
- bundle: support fsck message configuration
243
- bundle: add bundle verification options type
244
@@ -106,7 +247,8 @@ Release tarballs are available at:
247
fck check levels.
248
249
Expecting a reroll.
109
- source: <20241121204119.1440773-1-jltobler@gmail.com>
250
+ cf. <lqlchznj3gkvne3zqquz2elky36ubgh7y4n7m7wem5o3tad4bd@bvyjficofawj>
251
+ source: <20241127005707.319881-1-jltobler@gmail.com>
252
253
254
* tb/boundary-traversal-fix (2024-11-22) 1 commit
@@ -136,80 +278,14 @@ Release tarballs are available at:
278
to keep the promise "cloning a suspicious repository is a safe
279
first step to inspect it".
280
139
- Comments?
281
+ Will merge to 'next'.
282
+ cf. <xmqqed2yzc5z.fsf@gitster.g>
283
source: <20241115005404.3747302-2-sandals@crustytoothpaste.net>
284
285
143
-* kn/ref-transaction-hook-with-reflog (2024-11-15) 1 commit
144
- (merged to 'next' on 2024-11-20 at 23399887d7)
145
- + refs: don't invoke reference-transaction hook for reflogs
146
-
147
- The ref-transaction hook triggered for reflog updates, which has
148
- been corrected.
149
-
150
- Will merge to 'master'.
151
- source: <20241114-348-do-not-call-the-reference-transaction-hooks-for-reflogs-v1-1-ece7260ee3c1@gmail.com>
152
-
153
-
154
-* bc/c23 (2024-11-18) 2 commits
155
- (merged to 'next' on 2024-11-20 at bd29255bf3)
156
- + reflog: rename unreachable
157
- + index-pack: rename struct thread_local
158
-
159
- C23 compatibility updates.
160
-
161
- Will merge to 'master'.
162
- source: <20241117013149.576671-1-sandals@crustytoothpaste.net>
163
-
164
-
165
-* jk/gcc15 (2024-11-18) 6 commits
166
- (merged to 'next' on 2024-11-20 at fa92bcdeb9)
167
- + object-file: inline empty tree and blob literals
168
- + object-file: treat cached_object values as const
169
- + object-file: drop oid field from find_cached_object() return value
170
- + object-file: move empty_tree struct into find_cached_object()
171
- + object-file: drop confusing oid initializer of empty_tree struct
172
- + object-file: prefer array-of-bytes initializer for hash literals
173
-
174
- GCC 15 compatibility updates.
175
-
176
- Will merge to 'master'.
177
- source: <20241118095423.GA3990835@coredump.intra.peff.net>
178
-
179
-
180
-* kh/trailer-in-glossary (2024-11-18) 1 commit
181
- (merged to 'next' on 2024-11-20 at fad433e2f4)
182
- + Documentation/glossary: describe "trailer"
183
-
184
- Doc updates.
185
-
186
- Will merge to 'master'.
187
- source: <ba35ba3ec212860a3151cfad582a384a50c55e6a.1731871683.git.code@khaugsbakk.name>
188
-
189
-
190
-* en/fast-import-avoid-self-replace (2024-11-19) 1 commit
191
- (merged to 'next' on 2024-11-20 at 751ee6b395)
192
- + fast-import: avoid making replace refs point to themselves
193
-
194
- "git fast-import" can be tricked into a replace ref that maps an
195
- object to itself, which is a useless thing to do.
196
-
197
- Will merge to 'master'.
198
- source: <pull.1824.v2.git.1731968389590.gitgitgadget@gmail.com>
199
-
200
-
201
-* jt/index-pack-allow-promisor-only-while-fetching (2024-11-20) 1 commit
202
- (merged to 'next' on 2024-11-20 at 9bd7657760)
203
- + index-pack: teach --promisor to forbid pack name
204
-
205
- We now ensure "index-pack" is used with the "--promisor" option
206
- only during a "git fetch".
207
-
208
- Will merge to 'master'.
209
- source: <20241119201016.22713-1-jonathantanmy@google.com>
210
-
211
-
212
-* ps/gc-stale-lock-warning (2024-11-20) 1 commit
286
+* ps/gc-stale-lock-warning (2024-11-25) 2 commits
287
+ (merged to 'next' on 2024-11-26 at ed3858b2ea)
288
+ + t7900: fix host-dependent behaviour when testing git-maintenance(1)
289
(merged to 'next' on 2024-11-20 at 1099c31715)
290
+ builtin/gc: provide hint when maintenance hits a stale schedule lock
291
@@ -218,6 +294,7 @@ Release tarballs are available at:
294
295
Will merge to 'master'.
296
source: <20241119-pks-maintenance-hint-with-stale-lock-v1-1-f9f9a98e12a0@pks.im>
297
+ source: <eb504a75147d8609be66e131d239a69d192d693d.1732511129.git.ps@pks.im>
298
299
300
* tb/incremental-midx-part-2 (2024-11-20) 15 commits
@@ -244,29 +321,17 @@ Release tarballs are available at:
321
322
323
* ja/git-diff-doc-markup (2024-11-19) 5 commits
247
- - doc: git-diff: apply format changes to config part
248
- - doc: git-diff: apply format changes to diff-generate-patch
249
- - doc: git-diff: apply format changes to diff-format
250
- - doc: git-diff: apply format changes to diff-options
251
- - doc: git-diff: apply new documentation guidelines
324
+ (merged to 'next' on 2024-11-27 at b33b5ae49b)
325
+ + doc: git-diff: apply format changes to config part
326
+ + doc: git-diff: apply format changes to diff-generate-patch
327
+ + doc: git-diff: apply format changes to diff-format
328
+ + doc: git-diff: apply format changes to diff-options
329
+ + doc: git-diff: apply new documentation guidelines
330
331
Documentation mark-up updates.
332
255
- Will merge to 'next'?
256
- source: <pull.1769.v4.git.1731967553.gitgitgadget@gmail.com>
257
-
258
-
259
-* ps/clar-build-improvement (2024-11-18) 4 commits
260
- (merged to 'next' on 2024-11-20 at d88840a15d)
261
- + Makefile: let clar header targets depend on their scripts
262
- + cmake: use verbatim arguments when invoking clar commands
263
- + cmake: use SH_EXE to execute clar scripts
264
- + t/unit-tests: convert "clar-generate.awk" into a shell script
265
-
266
- Fix for clar unit tests to support CMake build.
267
-
333
Will merge to 'master'.
269
- source: <20241115-pks-clar-build-improvements-v3-0-29672bf65ec6@pks.im>
334
+ source: <pull.1769.v4.git.1731967553.gitgitgadget@gmail.com>
335
336
337
* pb/mergetool-errors (2024-11-25) 5 commits
@@ -279,7 +344,7 @@ Release tarballs are available at:
344
End-user experience of "git mergetool" when the command errors out
345
has been improved.
346
282
- Will merge to 'next'?
347
+ Will merge to 'next'.
348
source: <pull.1827.v2.git.1732305022.gitgitgadget@gmail.com>
349
350
@@ -295,11 +360,15 @@ Release tarballs are available at:
360
other side, losing the error status from the child process, which
361
has been corrected.
362
298
- Needs review.
363
+ Probably needs a redesign.
364
+ cf. <Z0Q0wfSTk_cUXH0F@pks.im>
365
source: <cover.1731603991.git.zhiyou.jx@alibaba-inc.com>
366
367
302
-* ps/ref-backend-migration-optim (2024-11-21) 10 commits
368
+* ps/ref-backend-migration-optim (2024-11-26) 12 commits
369
+ (merged to 'next' on 2024-11-26 at 7bb66a1faf)
370
+ + reftable: rename scratch buffer
371
+ + refs: adapt `initial_transaction` flag to be unsigned
372
(merged to 'next' on 2024-11-25 at ee2e588790)
373
+ reftable/block: optimize allocations by using scratch buffer
374
+ reftable/block: rename `block_writer::buf` variable
@@ -316,6 +385,7 @@ Release tarballs are available at:
385
386
Will merge to 'master'.
387
source: <20241120-pks-refs-optimize-migrations-v2-0-a233374b7452@pks.im>
388
+ source: <20241125-pks-refs-migration-optimization-followup-v1-0-0e1b4a2af384@pks.im>
389
390
391
* js/log-remerge-keep-ancestry (2024-11-12) 1 commit
@@ -328,13 +398,15 @@ Release tarballs are available at:
398
source: <pull.1825.v2.git.1731350009491.gitgitgadget@gmail.com>
399
400
331
-* ps/reftable-iterator-reuse (2024-11-19) 9 commits
401
+* ps/reftable-iterator-reuse (2024-11-26) 11 commits
402
- refs/reftable: reuse iterators when reading refs
403
- reftable/merged: drain priority queue on reseek
404
- reftable/stack: add mechanism to notify callers on reload
405
- refs/reftable: refactor reflog expiry to use reftable backend
406
- refs/reftable: refactor reading symbolic refs to use reftable backend
407
- refs/reftable: read references via `struct reftable_backend`
408
+ - refs/reftable: figure out hash via `reftable_stack`
409
+ - reftable/stack: add accessor for the hash ID
410
- refs/reftable: handle reloading stacks in the reftable backend
411
- refs/reftable: encapsulate reftable stack
412
- Merge branch 'ps/reftable-detach' into ps/reftable-iterator-reuse
@@ -343,9 +415,8 @@ Release tarballs are available at:
415
Optimize reading random references out of the reftable backend by
416
allowing reuse of iterator objects.
417
346
- Expecting a reroll.
347
- cf. <ZzMaX8HCj3GO5JUJ@pks.im>
348
- source: <cover.1730792627.git.ps@pks.im>
418
+ Will merge to 'next'?
419
+ source: <20241126-pks-reftable-backend-reuse-iter-v4-0-b17fd27df126@pks.im>
420
421
422
* jc/move-is-bare-repository-cfg-variable-to-repo (2024-11-07) 3 commits
@@ -357,6 +428,7 @@ Release tarballs are available at:
428
into a member in the the_repo singleton repository object.
429
430
Waiting for response to reviews.
431
+ cf. <xmqqy116xvr3.fsf@gitster.g>
432
source: <pull.1826.git.git.1730926082.gitgitgadget@gmail.com>
433
434
@@ -368,7 +440,7 @@ Release tarballs are available at:
440
441
"git describe" optimization.
442
371
- Comments?
443
+ Will merge to 'next'.
444
source: <20241106192236.GC880133@coredump.intra.peff.net>
445
446
@@ -379,8 +451,8 @@ Release tarballs are available at:
451
commits in the ranges being compared, with the --diff-merges
452
option.
453
382
- Almost there.
383
- cf. <CABPp-BHNVEvYx4KwmiSQhPqidhPffb5hGBt=uT5NKqBPXC4j0w@mail.gmail.com>
454
+ Expecting a (hopefully final and) small reroll.
455
+ cf. <eb502feb-1563-b1b5-5345-784673c89c79@gmx.de>
456
source: <pull.1734.v2.git.1731073383564.gitgitgadget@gmail.com>
457
458
@@ -414,6 +486,7 @@ Release tarballs are available at:
486
+ bisect: fix leaking good/bad terms when reading multipe times
487
+ builtin/blame: fix leaking blame entries with `--incremental`
488
+ Merge branch 'ps/leakfixes-part-9' into ps/leakfixes-part-10
489
+ (this branch is used by ps/bisect-double-free-fix.)
490
491
Leakfixes.
492
@@ -421,15 +494,16 @@ Release tarballs are available at:
494
source: <20241120-b4-pks-leak-fixes-pt10-v3-0-d67f08f45c74@pks.im>
495
496
424
-* kh/sequencer-comment-char (2024-11-25) 3 commits
425
- - sequencer: comment commit messages properly
426
- - sequencer: comment `--reference` subject line properly
427
- - sequencer: comment checked-out branch properly
497
+* kh/sequencer-comment-char (2024-11-26) 3 commits
498
+ (merged to 'next' on 2024-11-28 at 84693f6bb7)
499
+ + sequencer: comment commit messages properly
500
+ + sequencer: comment `--reference` subject line properly
501
+ + sequencer: comment checked-out branch properly
502
503
The sequencer failed to honor core.commentString in some places.
504
431
- Will merge to 'next'?
432
- source: <cover.1732481200.git.code@khaugsbakk.name>
505
+ Will merge to 'master'.
506
+ source: <cover.1732565412.git.code@khaugsbakk.name>
507
508
509
* ds/full-name-hash (2024-11-04) 7 commits
@@ -462,6 +536,7 @@ Release tarballs are available at:
536
path, or by type.
537
538
Comments?
539
+ cf. <Z0V8D4r5YbxjNvPs@pks.im>
540
source: <pull.1818.v2.git.1731181272.gitgitgadget@gmail.com>
541
542
@@ -472,11 +547,11 @@ Release tarballs are available at:
547
548
Drop support for ancient environments in various CI jobs.
549
475
- Needs review.
550
+ Will merge to 'next'.
551
source: <20241031234934.3451390-1-sandals@crustytoothpaste.net>
552
553
479
-* cw/worktree-extension (2024-11-01) 9 commits
554
+* cw/worktree-extension (2024-11-26) 8 commits
555
- worktree: refactor `repair_worktree_after_gitdir_move()`
556
- worktree: add relative cli/config options to `repair` command
557
- worktree: add relative cli/config options to `move` command
@@ -485,28 +560,12 @@ Release tarballs are available at:
560
- worktree: refactor infer_backlink return
561
- worktree: add `relativeWorktrees` extension
562
- setup: correctly reinitialize repository version
488
- - Merge branch 'cw/config-extensions' into cw/worktree
563
564
Introduce a new repository extension to prevent older Git versions
565
from mis-interpreting worktrees created with relative paths.
566
493
- Expecting a reroll.
494
- cf. <D5SS3P7WQG4F.1I20Z59IDQMD1@pm.me>
495
- source: <20241031-wt_relative_options-v4-0-07a3dc0f02a3@pm.me>
496
-
497
-
498
-* kh/bundle-docs (2024-11-18) 4 commits
499
- (merged to 'next' on 2024-11-20 at d70c2c32ce)
500
- + Documentation/git-bundle.txt: discuss naïve backups
501
- + Documentation/git-bundle.txt: mention --all in spec. refs
502
- + Documentation/git-bundle.txt: remove old `--all` example
503
- + Documentation/git-bundle.txt: mention full backup example
504
-
505
- Documentation improvements to more prominently call out the use of
506
- '--all' when creating bundles.
507
-
508
- Will merge to 'master'.
509
- source: <cover.1731768344.git.code@khaugsbakk.name>
567
+ Will merge to 'next'?
568
+ source: <20241125-wt_relative_options-v5-0-356d122ff3db@pm.me>
569
570
571
* as/show-index-uninitialized-hash (2024-11-11) 2 commits
@@ -558,22 +617,23 @@ Release tarballs are available at:
617
618
619
* bc/drop-ancient-libcurl-and-perl (2024-10-23) 12 commits
561
- - gitweb: make use of s///r
562
- - Require Perl 5.26.0
563
- - INSTALL: document requirement for libcurl 7.61.0
564
- - git-curl-compat: remove check for curl 7.56.0
565
- - git-curl-compat: remove check for curl 7.53.0
566
- - git-curl-compat: remove check for curl 7.52.0
567
- - git-curl-compat: remove check for curl 7.44.0
568
- - git-curl-compat: remove check for curl 7.43.0
569
- - git-curl-compat: remove check for curl 7.39.0
570
- - git-curl-compat: remove check for curl 7.34.0
571
- - git-curl-compat: remove check for curl 7.25.0
572
- - git-curl-compat: remove check for curl 7.21.5
620
+ (merged to 'next' on 2024-11-27 at aa7866a3ab)
621
+ + gitweb: make use of s///r
622
+ + Require Perl 5.26.0
623
+ + INSTALL: document requirement for libcurl 7.61.0
624
+ + git-curl-compat: remove check for curl 7.56.0
625
+ + git-curl-compat: remove check for curl 7.53.0
626
+ + git-curl-compat: remove check for curl 7.52.0
627
+ + git-curl-compat: remove check for curl 7.44.0
628
+ + git-curl-compat: remove check for curl 7.43.0
629
+ + git-curl-compat: remove check for curl 7.39.0
630
+ + git-curl-compat: remove check for curl 7.34.0
631
+ + git-curl-compat: remove check for curl 7.25.0
632
+ + git-curl-compat: remove check for curl 7.21.5
633
634
Drop support for older libcURL and Perl.
635
576
- Under discussion.
636
+ Will merge to 'master'.
637
source: <20241023004600.1645313-1-sandals@crustytoothpaste.net>
638
639
@@ -599,18 +659,17 @@ Release tarballs are available at:
659
- refs: standardize output of refs_read_symbolic_ref
660
- t/t5505-remote: test failure of set-head
661
- t/t5505-remote: set default branch to main
662
+ (this branch is used by bf/fetch-set-head-config.)
663
664
When "git fetch $remote" notices that refs/remotes/$remote/HEAD is
665
missing and discovers what branch the other side points with its
666
HEAD, refs/remotes/$remote/HEAD is updated to point to it.
667
607
- Will merge to 'next'?
668
+ Will merge to 'next'.
669
source: <20241122123138.66960-1-bence@ferdinandy.com>
670
671
611
-* ps/build (2024-11-22) 25 commits
612
- - fixup! Makefile: propagate Git version via generated header
613
- - fixup! Makefile: generate doc versions via GIT-VERSION-GEN
672
+* ps/build (2024-11-26) 24 commits
673
- meson: fix conflicts with in-flight topics
674
- Introduce support for the Meson build system
675
- Documentation: add comparison of build systems
@@ -634,14 +693,15 @@ Release tarballs are available at:
693
- Makefile: refactor GIT-VERSION-GEN to be reusable
694
- Makefile: consistently use @PLACEHOLDER@ to substitute
695
- Makefile: use common template for GIT-BUILD-OPTIONS
696
+ - Merge branch 'ps/clar-build-improvement' into ps/build
697
698
Build procedure update plus introduction of Mason based builds
699
640
- Getting there.
641
- source: <20241119-pks-meson-v8-0-809bf7f042f3@pks.im>
700
+ Will merge to 'next'?
701
+ source: <20241125-pks-meson-v9-0-1c6cf242a5f1@pks.im>
702
703
644
-* ej/cat-file-remote-object-info (2024-11-11) 6 commits
704
+* ej/cat-file-remote-object-info (2024-11-25) 6 commits
705
- cat-file: add remote-object-info to batch-command
706
- transport: add client support for object-info
707
- serve: advertise object-info feature
@@ -652,8 +712,9 @@ Release tarballs are available at:
712
"git cat-file --batch" and friends can optionally ask a remote
713
server about objects it does not have.
714
655
- Needs review.
656
- source: <20241108162441.50736-1-eric.peijian@gmail.com>
715
+ Expecting a reroll.
716
+ cf. <Z0RIrKwUnaWWm_gJ@pks.im>
717
+ source: <20241125053616.25170-1-eric.peijian@gmail.com>
718
719
720
* cc/promisor-remote-capability (2024-09-10) 4 commits
@@ -707,7 +768,7 @@ Release tarballs are available at:
768
source: <cover.1729032373.git.steadmon@google.com>
769
770
710
-* kn/the-repository (2024-11-25) 10 commits
771
+* kn/the-repository (2024-11-27) 10 commits
772
- packfile.c: remove unnecessary prepare_packed_git() call
773
- midx: add repository to `multi_pack_index` struct
774
- config: make `packed_git_(limit|window_size)` non-global variables
@@ -724,4 +785,4 @@ Release tarballs are available at:
785
have been eliminated.
786
787
Will merge to 'next'?
727
- source: <cover.1732269840.git.karthik.188@gmail.com>
788
+ source: <cover.1732618495.git.karthik.188@gmail.com>