What's cooking (2024/12 #06)
Junio C Hamano committed
Dec 16, 2024 at 09:33 UTC
1ecee944e69f3108b695746f09bb999616776697
1 file changed
+122
-330
whats-cooking.txt
+122
-330
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2024, #05; Thu, 12)
3
-X-master-at: caacdb5dfd60540ecec30ec479f147f3c8167e11
4
-X-next-at: f74b3f243a33d7963d06298c0bdf84cc5f3ff26b
2
+Subject: What's cooking in git.git (Dec 2024, #06; Mon, 16)
3
+X-master-at: 063bcebf0c917140ca0e705cbe0fdea127e90086
4
+X-next-at: 0fc57dec578fcc8dcda5cc3de6b81fa1f6719770
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Dec 2024, #05; Thu, 12)
7
+What's cooking in git.git (Dec 2024, #06; Mon, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,11 @@ 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
+An early preview release Git 2.48-rc0 has been tagged. The rate of
21
+arrival of new topics unfortunately exceeds the rate of reviews and
22
+iterations, which means that many topics are left out of 'next',
23
+waiting to be reviewed.
24
+
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
27
repositories have only a subset of branches.
@@ -46,7 +51,39 @@ Release tarballs are available at:
51
https://www.kernel.org/pub/software/scm/git/
52
53
--------------------------------------------------
49
-[New Topics]
54
+[Cooking]
55
+
56
+* ps/build-meson-html (2024-12-13) 11 commits
57
+ - meson: install static files for HTML documentation
58
+ - meson: generate articles
59
+ - Documentation: refactor "howto-index.sh" for out-of-tree builds
60
+ - Documentation: refactor "api-index.sh" for out-of-tree builds
61
+ - meson: generate user manual
62
+ - Documentation: inline user-manual.conf
63
+ - meson: generate HTML pages for all man page categories
64
+ - meson: fix generation of merge tools
65
+ - meson: properly wire up dependencies for our docs
66
+ - meson: wire up support for AsciiDoctor
67
+ - Merge branch 'ps/build' into ps/build-meson-html
68
+
69
+ The build procedure based on meson learned to generate HTML
70
+ documention pages.
71
+
72
+ Needs review.
73
+ source: <20241213-b4-pks-meson-docs-v1-0-0c7895952cd3@pks.im>
74
+
75
+
76
+* jc/doc-attr-tree (2024-12-14) 1 commit
77
+ - doc: give attr.tree a bit more visibility
78
+
79
+ Make sure that "git --attr-source=X", GIT_ATTR_SOURCE, and
80
+ attr.tree configuration variables appear at the same places in the
81
+ documentation.
82
+
83
+ On hold.
84
+ cf. <20241216111112.GA2201417@coredump.intra.peff.net>
85
+ source: <xmqq5xnladwi.fsf@gitster.g>
86
+
87
88
* ps/3.0-remote-deprecation (2024-12-12) 6 commits
89
- remote: announce removal of "branches/" and "remotes/"
@@ -55,7 +92,6 @@ Release tarballs are available at:
92
- ci: merge linux-gcc-default into linux-gcc
93
- Makefile: wire up build option for deprecated features
94
- Merge branch 'ps/build' into ps/3.0-remote-deprecation
58
- (this branch uses ps/build.)
95
96
Following the procedure we established to introduce breaking
97
changes for Git 3.0, allow an early opt-in for removing support of
@@ -66,7 +102,7 @@ Release tarballs are available at:
102
source: <20241211-pks-remote-branches-deprecation-v1-0-1431e2369135@pks.im>
103
104
69
-* ps/ci-meson (2024-12-12) 10 commits
105
+* ps/ci-meson (2024-12-13) 10 commits
106
- ci: wire up Meson builds
107
- t: introduce compatibility options to clar-based tests
108
- t: fix out-of-tree tests for some git-p4 tests
@@ -77,64 +113,54 @@ Release tarballs are available at:
113
- ci/lib: support custom output directories when creating test artifacts
114
- Merge branch 'ps/build' into ps/ci-meson
115
- Merge branch 'cw/worktree-extension' into ps/ci-meson
80
- (this branch uses cw/worktree-extension and ps/build.)
116
117
The meson-build procedure is integrated into CI to catch and
118
prevent bitrotting.
119
85
- Needs review.
86
- source: <20241211-pks-meson-ci-v1-0-28d18b494374@pks.im>
87
-
88
---------------------------------------------------
89
-[Cooking]
90
-
91
-* kn/reflog-migration (2024-12-11) 8 commits
92
- - SQUASH
93
- - refs: add support for migrating reflogs
94
- - refs: allow multiple reflog entries for the same refname
95
- - refs: introduce the `ref_transaction_update_reflog` function
96
- - refs: extract out refname verification in transactions
97
- - refs/files: add count field to ref_lock
98
- - refs: add `index` field to `struct ref_udpate`
99
- - refs: include committer info in `ref_update` struct
120
+ Will merge to 'next'.
121
+ cf. <87zfkwgehr.fsf@iotcl.com>
122
+ source: <20241213-pks-meson-ci-v2-0-634affccc694@pks.im>
123
+
124
+
125
+* kn/reflog-migration (2024-12-15) 9 commits
126
+ . refs: add support for migrating reflogs
127
+ . refs: allow multiple reflog entries for the same refname
128
+ . refs: introduce the `ref_transaction_update_reflog` function
129
+ . refs: add `committer_info` to `ref_transaction_add_update()`
130
+ . refs: extract out refname verification in transactions
131
+ . refs/files: add count field to ref_lock
132
+ . refs: add `index` field to `struct ref_udpate`
133
+ . refs: include committer info in `ref_update` struct
134
+ . Merge branch 'kn/reftable-writer-log-write-verify' into kn/reflog-migration
135
+ (this branch uses kn/reftable-writer-log-write-verify.)
136
137
"git refs migrate" learned to also migrate the reflog data across
138
backends.
139
104
- Needs review.
105
- source: <20241209-320-git-refs-migrate-reflogs-v1-0-d4bc37ee860f@gmail.com>
106
- source: <CAOLa=ZRsAwM8oUnyYCaRKkkudN+QW+hRSKZEvPJLThSr14M7rA@mail.gmail.com>
140
+ Does not seem to pass its own test.
141
+ source: <20241215-320-git-refs-migrate-reflogs-v3-0-4127fe707b98@gmail.com>
142
143
144
* mh/doc-windows-home-env (2024-12-10) 1 commit
110
- - Document HOME environment variable
145
+ (merged to 'next' on 2024-12-13 at 9f49e6f9dd)
146
+ + Document HOME environment variable
147
148
Doc update.
149
114
- Will merge to 'next'.
150
+ Will merge to 'master'.
151
source: <pull.1834.git.1733771894867.gitgitgadget@gmail.com>
152
153
154
* tc/bundle-with-tag-remove-workaround (2024-12-12) 1 commit
119
- - bundle: remove unneeded code
155
+ (merged to 'next' on 2024-12-13 at 7f4ebe0be3)
156
+ + bundle: remove unneeded code
157
158
"git bundle create" with an annotated tag on the positive end of
159
the revision range had a workaround code for older limitation in
160
the revision walker, which has become unnecessary.
161
125
- Will merge to 'next'.
126
- source: <20241211-fix-bundle-create-race-v3-1-0587f6f9db1b@iotcl.com>
127
-
128
-
129
-* bf/explicit-config-set-in-advice-messages (2024-12-06) 1 commit
130
- (merged to 'next' on 2024-12-11 at a20c319038)
131
- + advice: suggest using subcommand "git config set"
132
-
133
- The advice messages now tell the newer 'git config set' command to
134
- set the advice.token configuration variable to squelch a message.
135
-
162
Will merge to 'master'.
137
- source: <20241205122225.1184215-1-bence@ferdinandy.com>
163
+ source: <20241211-fix-bundle-create-race-v3-1-0587f6f9db1b@iotcl.com>
164
165
166
* cc/lop-remote (2024-12-07) 5 commits
@@ -163,37 +189,33 @@ Release tarballs are available at:
189
190
191
* kn/reftable-writer-log-write-verify (2024-12-07) 1 commit
166
- - reftable/writer: ensure valid range for log's update_index
192
+ (merged to 'next' on 2024-12-15 at 7e6b58d98e)
193
+ + reftable/writer: ensure valid range for log's update_index
194
+ (this branch is used by kn/reflog-migration.)
195
+
196
+ Reftable backend adds check for upper limit of log's update_index.
197
198
+ Will merge to 'master'.
199
source: <20241206-424-reftable-writer-add-check-for-limits-v2-1-82ca350b10be@gmail.com>
200
201
202
* ps/ci-gitlab-update (2024-12-12) 4 commits
172
- - ci/lib: fix "CI setup" sections with GitLab CI
173
- - ci/lib: do not interpret escape sequences in `group ()` arguments
174
- - ci/lib: remove duplicate trap to end "CI setup" group
175
- - gitlab-ci: update macOS images to Sonoma
203
+ (merged to 'next' on 2024-12-15 at e0ca818197)
204
+ + ci/lib: fix "CI setup" sections with GitLab CI
205
+ + ci/lib: do not interpret escape sequences in `group ()` arguments
206
+ + ci/lib: remove duplicate trap to end "CI setup" group
207
+ + gitlab-ci: update macOS images to Sonoma
208
209
GitLab CI updates.
210
179
- Will merge to 'next'.
180
- source: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im>
181
-
182
-
183
-* ps/commit-with-message-syntax-fix (2024-12-08) 1 commit
184
- (merged to 'next' on 2024-12-11 at da3d13a723)
185
- + object-name: fix reversed ordering with ":/<text>" revisions
186
-
187
- The syntax ":/<text>" to name the latest commit with the matching
188
- text was broken with a recent change, which has been corrected.
189
-
211
Will merge to 'master'.
191
- source: <20241206-pks-rev-parse-fix-reversed-list-v3-1-d934c17db168@pks.im>
212
+ source: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im>
213
214
215
* jc/set-head-symref-fix (2024-12-07) 2 commits
195
- - fetch: do not ask for HEAD unnecessarily
196
- - Merge branch 'bf/set-head-symref' into js/set-head-symref-fix
216
+ (merged to 'next' on 2024-12-13 at 478444359e)
217
+ + fetch: do not ask for HEAD unnecessarily
218
+ + Merge branch 'bf/set-head-symref' into js/set-head-symref-fix
219
(this branch uses bf/set-head-symref.)
220
221
"git fetch" from a configured remote learned to update a missing
@@ -202,7 +224,7 @@ Release tarballs are available at:
224
this also corrects "git fetch --tags $URL" which was broken by the
225
new feature in an unspecified way.
226
205
- Will merge to 'next'.
227
+ Will merge to 'master'.
228
source: <xmqqcyi5xmhr.fsf@gitster.g>
229
230
@@ -222,115 +244,29 @@ Release tarballs are available at:
244
source: <20241210184442.10723-1-royeldar0@gmail.com>
245
246
225
-* jt/fix-fattening-promisor-fetch (2024-12-10) 3 commits
226
- (merged to 'next' on 2024-12-11 at 5a408010e9)
227
- + index-pack --promisor: also check commits' trees
228
- + index-pack --promisor: don't check blobs
229
- + index-pack --promisor: dedup before checking links
230
-
231
- Fix performance regression of a recent "fatten promisor pack with
232
- local objects" protection against an unwanted gc.
233
-
234
- Will merge to 'master'.
235
- source: <cover.1733262661.git.jonathantanmy@google.com>
236
-
237
-
238
-* kk/doc-ancestry-path (2024-12-04) 1 commit
239
- (merged to 'next' on 2024-12-05 at 36d6c51c96)
240
- + doc: mention rev-list --ancestry-path restrictions
241
-
242
- The --ancestry-path option is designed to be given a commit that is
243
- on the path, which was not documented, which has been corrected.
244
-
245
- Will merge to 'master'.
246
- source: <CADYQcGrD5KtM1sZQbccAtDaLmUXD8Gxv_nUWmapjfZm=TMq=Jw@mail.gmail.com>
247
-
248
-
249
-* kh/doc-bundle-typofix (2024-12-02) 1 commit
250
- (merged to 'next' on 2024-12-04 at 5da441ce36)
251
- + Documentation/git-bundle.txt: fix word join typo
252
-
253
- Typofix.
254
-
255
- Will merge to 'master'.
256
- source: <164b94bab9214f6030909df8f1e7c476b7f79e55.1732822997.git.code@khaugsbakk.name>
257
-
258
-
259
-* kh/doc-update-ref-grammofix (2024-12-02) 1 commit
260
- (merged to 'next' on 2024-12-04 at 9905f16afc)
261
- + Documentation/git-update-ref.txt: add missing word
262
-
263
- Grammofix.
264
-
265
- Will merge to 'master'.
266
- source: <6cc7a9d60216c966bcf77675aa22a39cfa8993e2.1732906187.git.code@khaugsbakk.name>
267
-
268
-
247
* ps/build-sign-compare (2024-12-06) 16 commits
270
- - t/helper: don't depend on implicit wraparound
271
- - scalar: address -Wsign-compare warnings
272
- - builtin/patch-id: fix type of `get_one_patchid()`
273
- - builtin/blame: fix type of `length` variable when emitting object ID
274
- - gpg-interface: address -Wsign-comparison warnings
275
- - daemon: fix type of `max_connections`
276
- - daemon: fix loops that have mismatching integer types
277
- - global: trivial conversions to fix `-Wsign-compare` warnings
278
- - pkt-line: fix -Wsign-compare warning on 32 bit platform
279
- - csum-file: fix -Wsign-compare warning on 32-bit platform
280
- - diff.h: fix index used to loop through unsigned integer
281
- - config.mak.dev: drop `-Wno-sign-compare`
282
- - global: mark code units that generate warnings with `-Wsign-compare`
283
- - compat/win32: fix -Wsign-compare warning in "wWinMain()"
284
- - compat/regex: explicitly ignore "-Wsign-compare" warnings
285
- - git-compat-util: introduce macros to disable "-Wsign-compare" warnings
248
+ (merged to 'next' on 2024-12-16 at 1ddb1485df)
249
+ + t/helper: don't depend on implicit wraparound
250
+ + scalar: address -Wsign-compare warnings
251
+ + builtin/patch-id: fix type of `get_one_patchid()`
252
+ + builtin/blame: fix type of `length` variable when emitting object ID
253
+ + gpg-interface: address -Wsign-comparison warnings
254
+ + daemon: fix type of `max_connections`
255
+ + daemon: fix loops that have mismatching integer types
256
+ + global: trivial conversions to fix `-Wsign-compare` warnings
257
+ + pkt-line: fix -Wsign-compare warning on 32 bit platform
258
+ + csum-file: fix -Wsign-compare warning on 32-bit platform
259
+ + diff.h: fix index used to loop through unsigned integer
260
+ + config.mak.dev: drop `-Wno-sign-compare`
261
+ + global: mark code units that generate warnings with `-Wsign-compare`
262
+ + compat/win32: fix -Wsign-compare warning in "wWinMain()"
263
+ + compat/regex: explicitly ignore "-Wsign-compare" warnings
264
+ + git-compat-util: introduce macros to disable "-Wsign-compare" warnings
265
266
Start working to make the codebase buildable with -Wsign-compare.
267
289
- Will merge to 'next'?
290
- source: <20241206-pks-sign-compare-v4-0-0344c6dfb219@pks.im>
291
-
292
-
293
-* rj/strvec-splice-fix (2024-12-10) 2 commits
294
- (merged to 'next' on 2024-12-11 at ddbfd8883a)
295
- + strvec: `strvec_splice()` to a statically initialized vector
296
- + Merge branch 'ps/leakfixes-part-10' into rj/strvec-splice-fix
297
-
298
- Correct strvec_splice() that misbehaved when the strvec is empty.
299
-
268
Will merge to 'master'.
301
- source: <3c7b3c26-7501-4797-8afa-c7f7e9c46558@gmail.com>
302
-
303
-
304
-* jc/forbid-head-as-tagname (2024-12-03) 4 commits
305
- (merged to 'next' on 2024-12-11 at adea88989e)
306
- + tag: "git tag" refuses to use HEAD as a tagname
307
- + t5604: do not expect that HEAD can be a valid tagname
308
- + refs: drop strbuf_ prefix from helpers
309
- + refs: move ref name helpers around
310
-
311
- "git tag" has been taught to refuse to create refs/tags/HEAD
312
- as such a tag will be confusing in the context of UI provided by
313
- the Git Porcelain commands.
314
-
315
- Will merge to 'master'.
316
- source: <20241203023240.3852850-1-gitster@pobox.com>
317
-
318
-
319
-* en/fast-import-verify-path (2024-12-04) 3 commits
320
- (merged to 'next' on 2024-12-05 at bbdd9b9659)
321
- + t9300: test verification of renamed paths
322
- (merged to 'next' on 2024-12-02 at 2932fa51e4)
323
- + fast-import: disallow more path components
324
- (merged to 'next' on 2024-11-27 at 8b145bb543)
325
- + fast-import: disallow "." and ".." path components
326
-
327
- "git fast-import" learned to reject paths with ".." and "." as
328
- their components to avoid creating invalid tree objects.
329
-
330
- Will merge to 'master'.
331
- source: <pull.1831.v2.git.1732561248717.gitgitgadget@gmail.com>
332
- source: <pull.1832.git.1732740464398.gitgitgadget@gmail.com>
333
- source: <20241203210652.GA1413195@coredump.intra.peff.net>
269
+ source: <20241206-pks-sign-compare-v4-0-0344c6dfb219@pks.im>
270
271
272
* bf/fetch-set-head-config (2024-12-06) 5 commits
@@ -346,42 +282,12 @@ Release tarballs are available at:
282
"git fetch" honors "remote.<remote>.followRemoteHEAD" settings to
283
tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD".
284
349
- Will merge to 'master' after bf/set-head-symref stabilizes.
285
+ Will merge to 'master' after bf/set-head-symref and its fix-up.
286
source: <20241128230806.2058962-1-bence@ferdinandy.com>
287
source: <20241204104003.514905-1-bence@ferdinandy.com>
288
source: <20241128111946.366584-1-bence@ferdinandy.com>
289
290
355
-* jc/doc-error-message-guidelines (2024-11-29) 1 commit
356
- (merged to 'next' on 2024-12-04 at 2d19ff44e5)
357
- + CodingGuidelines: a handful of error message guidelines
358
-
359
- Developer documentation update.
360
-
361
- Will merge to 'master'.
362
- source: <xmqqa5dkqjmr.fsf_-_@gitster.g>
363
-
364
-
365
-* kn/midx-wo-the-repository (2024-12-04) 10 commits
366
- (merged to 'next' on 2024-12-05 at e48a185ed0)
367
- + midx: inline the `MIDX_MIN_SIZE` definition
368
- + midx: pass down `hash_algo` to functions using global variables
369
- + midx: pass `repository` to `load_multi_pack_index`
370
- + midx: cleanup internal usage of `the_repository` and `the_hash_algo`
371
- + midx-write: pass down repository to `write_midx_file[_only]`
372
- + write-midx: add repository field to `write_midx_context`
373
- + midx-write: use `revs->repo` inside `read_refs_snapshot`
374
- + midx-write: pass down repository to static functions
375
- + Merge branch 'kn/pass-repo-to-builtin-sub-sub-commands' into kn/midx-wo-the-repository
376
- + Merge branch 'kn/the-repository' into kn/midx-wo-the-repository
377
- (this branch uses kn/the-repository.)
378
-
379
- Yet another "pass the repository through the callchain" topic.
380
-
381
- Will merge to 'master'.
382
- source: <20241127-374-refactor-midx-c-and-midx-write-c-to-not-depend-on-global-state-v3-0-c5a99f85009b@gmail.com>
383
-
384
-
291
* tb/unsafe-hash-test (2024-11-21) 2 commits
292
- t/helper/test-tool: implement sha1-unsafe helper
293
- t/helper/test-sha1: prepare for an unsafe mode
@@ -394,22 +300,6 @@ Release tarballs are available at:
300
source: <cover.1730833506.git.me@ttaylorr.com>
301
302
397
-* jt/bundle-fsck (2024-11-28) 4 commits
398
- (merged to 'next' on 2024-12-04 at bfd07a8936)
399
- + transport: propagate fsck configuration during bundle fetch
400
- + fetch-pack: split out fsck config parsing
401
- + bundle: support fsck message configuration
402
- + bundle: add bundle verification options type
403
-
404
- "git bundle --unbundle" and "git clone" running on a bundle file
405
- both learned to trigger fsck over the new objects with configurable
406
- fck check levels.
407
-
408
- Will merge to 'master'.
409
- cf. <Z08VoOHGZ1wecUx6@pks.im>
410
- source: <20241127233312.27710-1-jltobler@gmail.com>
411
-
412
-
303
* tb/incremental-midx-part-2 (2024-11-20) 15 commits
304
- midx: implement writing incremental MIDX bitmaps
305
- pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators
@@ -441,18 +331,19 @@ Release tarballs are available at:
331
other side, losing the error status from the child process, which
332
has been corrected.
333
444
- Needs review.
334
+ Needs to see if competing parallel topic needs to replace this one.
335
source: <20241113-pks-push-atomic-respect-exit-code-v1-0-7965f01e7f4e@pks.im>
336
337
448
-* js/log-remerge-keep-ancestry (2024-11-12) 1 commit
449
- - log: --remerge-diff needs to keep around commit parents
338
+* js/log-remerge-keep-ancestry (2024-12-13) 1 commit
339
+ (merged to 'next' on 2024-12-13 at 90156d79ed)
340
+ + log: --remerge-diff needs to keep around commit parents
341
+ (this branch is used by js/range-diff-diff-merges.)
342
343
"git log -p --remerge-diff --reverse" was completely broken.
344
453
- Expecting a hopefully small and final reroll.
454
- cf. <xmqqa5e5berx.fsf@gitster.g>
455
- source: <pull.1825.v2.git.1731350009491.gitgitgadget@gmail.com>
345
+ Will merge to 'master'.
346
+ source: <pull.1825.v3.git.1733999352289.gitgitgadget@gmail.com>
347
348
349
* jc/move-is-bare-repository-cfg-variable-to-repo (2024-11-07) 3 commits
@@ -470,32 +361,18 @@ Release tarballs are available at:
361
source: <pull.1826.git.git.1730926082.gitgitgadget@gmail.com>
362
363
473
-* jk/describe-perf (2024-12-06) 5 commits
474
- (merged to 'next' on 2024-12-11 at 509db1dc1a)
475
- + describe: split "found all tags" and max_candidates logic
476
- (merged to 'next' on 2024-12-02 at 0f34109a85)
477
- + describe: stop traversing when we run out of names
478
- + describe: stop digging for max_candidates+1
479
- + t/perf: add tests for git-describe
480
- + t6120: demonstrate weakness in disjoint-root handling
481
-
482
- "git describe" optimization.
483
-
484
- Will merge to 'master'.
485
- source: <20241106192236.GC880133@coredump.intra.peff.net>
486
- source: <20241206054218.GA3203047@coredump.intra.peff.net>
487
-
488
-
489
-* js/range-diff-diff-merges (2024-11-11) 1 commit
364
+* js/range-diff-diff-merges (2024-12-16) 3 commits
365
+ - range-diff: introduce the convenience option `--remerge-diff`
366
- range-diff: optionally include merge commits' diffs in the analysis
367
+ - Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges
368
+ (this branch uses js/log-remerge-keep-ancestry.)
369
370
"git range-diff" learned to optionally show and compare merge
371
commits in the ranges being compared, with the --diff-merges
372
option.
373
496
- Expecting a (hopefully final and) small reroll.
497
- cf. <eb502feb-1563-b1b5-5345-784673c89c79@gmx.de>
498
- source: <pull.1734.v2.git.1731073383564.gitgitgadget@gmail.com>
374
+ Will merge to 'next'?
375
+ source: <pull.1734.v3.git.1734358282.gitgitgadget@gmail.com>
376
377
378
* ds/name-hash-tweaks (2024-12-03) 8 commits
@@ -528,37 +405,18 @@ Release tarballs are available at:
405
Introduce a new API to visit objects in batches based on a common
406
path, or by type.
407
531
- Will merge to 'next'?
408
+ Under review.
409
source: <pull.1818.v3.git.1733514358.gitgitgadget@gmail.com>
410
411
535
-* cw/worktree-extension (2024-12-02) 8 commits
536
- (merged to 'next' on 2024-12-05 at 7bd98d132c)
537
- + worktree: refactor `repair_worktree_after_gitdir_move()`
538
- + worktree: add relative cli/config options to `repair` command
539
- + worktree: add relative cli/config options to `move` command
540
- + worktree: add relative cli/config options to `add` command
541
- + worktree: add `write_worktree_linking_files()` function
542
- + worktree: refactor infer_backlink return
543
- + worktree: add `relativeWorktrees` extension
544
- + setup: correctly reinitialize repository version
545
- (this branch is used by ps/ci-meson.)
546
-
547
- Introduce a new repository extension to prevent older Git versions
548
- from mis-interpreting worktrees created with relative paths.
549
-
550
- Will merge to 'master'.
551
- cf. <103c7a4d-a74b-4381-a9c7-33a89d5db192@gmail.com>
552
- source: <20241129-wt_relative_options-v6-0-44e4e0bec8c3@pm.me>
553
-
554
-
412
* as/show-index-uninitialized-hash (2024-11-11) 2 commits
556
- - t5300: add test for 'show-index --object-format'
557
- - show-index: fix uninitialized hash function
413
+ (merged to 'next' on 2024-12-16 at b54e9a56f0)
414
+ + t5300: add test for 'show-index --object-format'
415
+ + show-index: fix uninitialized hash function
416
417
Regression fix for 'show-index' when run outside of a repository.
418
561
- Comments?
419
+ Will merge to 'master'.
420
source: <20241109092739.14276-1-abhijeet.nkt@gmail.com>
421
422
@@ -582,18 +440,6 @@ Release tarballs are available at:
440
source: <pull.1817.git.git.1729370390416.gitgitgadget@gmail.com>
441
442
585
-* es/oss-fuzz (2024-10-16) 3 commits
586
- (merged to 'next' on 2024-12-05 at 1f973aece2)
587
- + fuzz: port fuzz-url-decode-mem from OSS-Fuzz
588
- + fuzz: port fuzz-parse-attr-line from OSS-Fuzz
589
- + fuzz: port fuzz-credential-from-url-gently from OSS-Fuzz
590
-
591
- Backport oss-fuzz tests for us to our codebase.
592
-
593
- Will merge to 'master'.
594
- source: <cover.1728939687.git.steadmon@google.com>
595
-
596
-
443
* bf/set-head-symref (2024-11-25) 10 commits
444
(merged to 'next' on 2024-12-02 at b142ff3d8e)
445
+ fetch set_head: handle mirrored bare repositories
@@ -612,44 +458,10 @@ Release tarballs are available at:
458
missing and discovers what branch the other side points with its
459
HEAD, refs/remotes/$remote/HEAD is updated to point to it.
460
615
- Needs to wait until set-head-symref-fix topic solidifies.
461
+ Will merge to 'master' together with jc/set-head-symref-fix.
462
source: <20241122123138.66960-1-bence@ferdinandy.com>
463
464
619
-* ps/build (2024-12-07) 24 commits
620
- (merged to 'next' on 2024-12-11 at cb270b3dea)
621
- + Introduce support for the Meson build system
622
- + Documentation: add comparison of build systems
623
- + t: allow overriding build dir
624
- + t: better support for out-of-tree builds
625
- + Documentation: extract script to generate a list of mergetools
626
- + Documentation: teach "cmd-list.perl" about out-of-tree builds
627
- + Documentation: allow sourcing generated includes from separate dir
628
- + Makefile: simplify building of templates
629
- + Makefile: write absolute program path into bin-wrappers
630
- + Makefile: allow "bin-wrappers/" directory to exist
631
- + Makefile: refactor generators to be PWD-independent
632
- + Makefile: extract script to generate gitweb.js
633
- + Makefile: extract script to generate gitweb.cgi
634
- + Makefile: extract script to massage Python scripts
635
- + Makefile: extract script to massage Shell scripts
636
- + Makefile: use "generate-perl.sh" to massage Perl library
637
- + Makefile: extract script to massage Perl scripts
638
- + Makefile: consistently use PERL_PATH
639
- + Makefile: generate doc versions via GIT-VERSION-GEN
640
- + Makefile: generate "git.rc" via GIT-VERSION-GEN
641
- + Makefile: propagate Git version via generated header
642
- + Makefile: refactor GIT-VERSION-GEN to be reusable
643
- + Makefile: consistently use @PLACEHOLDER@ to substitute
644
- + Makefile: use common template for GIT-BUILD-OPTIONS
645
- (this branch is used by ps/3.0-remote-deprecation and ps/ci-meson.)
646
-
647
- Build procedure update plus introduction of Mason based builds.
648
-
649
- Will merge to 'master'.
650
- source: <20241206-pks-meson-v11-0-525ed4792b88@pks.im>
651
-
652
-
465
* ej/cat-file-remote-object-info (2024-11-25) 6 commits
466
- cat-file: add remote-object-info to batch-command
467
- transport: add client support for object-info
@@ -673,31 +485,11 @@ Release tarballs are available at:
485
- libgit-sys: introduce Rust wrapper for libgit.a
486
- common-main: split init and exit code into new files
487
676
- An rust binding to libgit.a functions has been introduced.
488
+ A rust binding to libgit.a functions has been introduced.
489
490
Will discard?
491
source: <cover.1729032373.git.steadmon@google.com>
492
681
-
682
-* kn/the-repository (2024-12-04) 10 commits
683
- + packfile.c: remove unnecessary prepare_packed_git() call
684
- + midx: add repository to `multi_pack_index` struct
685
- + config: make `packed_git_(limit|window_size)` non-global variables
686
- + config: make `delta_base_cache_limit` a non-global variable
687
- + packfile: pass down repository to `for_each_packed_object`
688
- + packfile: pass down repository to `has_object[_kept]_pack`
689
- + packfile: pass down repository to `odb_pack_name`
690
- + packfile: pass `repository` to static function in the file
691
- + packfile: use `repository` from `packed_git` directly
692
- + packfile: add repository to struct `packed_git`
693
- (this branch is used by kn/midx-wo-the-repository.)
694
-
695
- Various implicit uses of 'the_repoository' in the packfile code
696
- have been eliminated.
697
-
698
- Will merge to 'master'.
699
- source: <cover.1733236936.git.karthik.188@gmail.com>
700
-
493
--------------------------------------------------
494
[Discarded]
495