What's cooking (2025/04 #02)
Junio C Hamano committed
Apr 8, 2025 at 13:23 UTC
1f040151504d97e3e5942ca03f2c2673ab8d6309
1 file changed
+479
-687
whats-cooking.txt
+479
-687
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2025, #01; Mon, 7)
3
-X-master-at: 5b97a56fa0e7d580dc8865b73107407c9b3f0eff
4
-X-next-at: ff1f9ca942cece7b528239c099ac8bd8fcf768ce
2
+Subject: What's cooking in git.git (Apr 2025, #02; Tue, 8)
3
+X-master-at: 485f5f863615e670fd97ae40af744e14072cfe18
4
+X-next-at: 153de2bbd5a1ce082d4d036a9daca0f0100fe8a1
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2025, #01; Mon, 7)
7
+What's cooking in git.git (Apr 2025, #02; Tue, 8)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,13 +17,10 @@ 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
-As you can see, a handful of topics are marked as "Need to pick up a
21
-newer iteration"; I am aware of these newer threads but haven't
22
-caught up with them. I'll probably spend more time on flushing what
23
-has been cooking already in my tree down to 'master', and then
24
-replace these topics with newer iteration before merging them to
25
-'next', before starting to pick up new topics that haven't hit my
26
-tree yet. Hopefully that would happen in a few days.
20
+As some of you may know, I do not like to issue "What's cooking"
21
+reports rapidly in a row (which in turn means making merges to
22
+'master' too often), but with so many backlogs that have matured,
23
+I couldn't help it.
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
@@ -56,172 +53,289 @@ Release tarballs are available at:
53
--------------------------------------------------
54
[Graduated to 'master']
55
59
-* ab/decorate-code-cleanup (2025-03-10) 1 commit
60
- (merged to 'next' on 2025-03-18 at 7ede1484eb)
61
- + decorate: fix sign comparison warnings
56
+* aj/doc-restore-p-update (2025-03-18) 1 commit
57
+ (merged to 'next' on 2025-03-24 at bdcfdc7f4e)
58
+ + doc: restore: remove note on --patch w/ pathspecs
59
63
- Code clean-up.
64
- source: <7c219279-8151-49c0-8fc0-8abe2624aca9@gmail.com>
60
+ Stale description in "git restore -p" documentation has been
61
+ updated.
62
+ source: <pull.1504.v2.git.git.1685654097812.gitgitgadget@gmail.com>
63
+
64
+
65
+* cc/lop-remote (2025-03-18) 4 commits
66
+ (merged to 'next' on 2025-03-24 at 3b685ceef0)
67
+ + promisor-remote: compare remote names case sensitively
68
+ + promisor-remote: fix possible issue when no URL is advertised
69
+ + promisor-remote: fix segfault when remote URL is missing
70
+ + t5710: arrange to delete the client before cloning
71
+
72
+ Bugfix in newly introduced large-object-promisor remote support.
73
+ source: <20250318110008.656695-1-christian.couder@gmail.com>
74
+
75
+
76
+* dk/vimdiff-doc-fix (2025-03-25) 1 commit
77
+ (merged to 'next' on 2025-03-29 at d0c7a36752)
78
+ + vimdiff: clarify the sigil used for marking the buffer to save
79
+
80
+ Doc update.
81
+ source: <20250324205327.79627-1-ben.knoble+github@gmail.com>
82
+
83
+
84
+* dm/completion-remote-names-fix (2025-03-23) 2 commits
85
+ (merged to 'next' on 2025-03-26 at b9460e20ae)
86
+ + completion: fix bugs with slashes in remote names
87
+ + completion: add helper to count path components
88
+
89
+ The bash command line completion script (in contrib/) has been
90
+ updated to cope with remote repository nicknames with slashes in
91
+ them.
92
+ source: <17274df2746d304db876ebd82ad8d932@mandelberg.org>
93
+
94
+
95
+* en/assert-wo-side-effects (2025-03-21) 3 commits
96
+ (merged to 'next' on 2025-03-29 at de89bb3075)
97
+ + treewide: replace assert() with ASSERT() in special cases
98
+ + ci: add build checking for side-effects in assert() calls
99
+ + git-compat-util: introduce ASSERT() macro
100
+
101
+ Ensure what we write in assert() does not have side effects,
102
+ and introduce ASSERT() macro to mark those that cannot be
103
+ mechanically checked for lack of side effects.
104
+ source: <pull.1881.v3.git.1742401378.gitgitgadget@gmail.com>
105
+
106
+
107
+* es/meson-build-skip-coccinelle (2025-03-25) 1 commit
108
+ (merged to 'next' on 2025-03-29 at 748d830ce7)
109
+ + meson: disable coccinelle configuration when building from a tarball
110
111
+ Build fix.
112
+ source: <20250325200920.198057-1-eschwartz@gentoo.org>
113
67
-* am/dir-dedup-decl-of-repository (2025-03-11) 1 commit
68
- (merged to 'next' on 2025-03-18 at 9075454132)
69
- + dir.h: remove duplicate forward declaration of struct repository
114
71
- Code cleanup.
72
- source: <pull.1879.git.1741705175922.gitgitgadget@gmail.com>
115
+* fr/vimdiff-layout-fixes (2025-03-25) 2 commits
116
+ (merged to 'next' on 2025-03-29 at 367b2105c0)
117
+ + mergetools: vimdiff: add tests for layout with REMOTE as the target
118
+ + mergetools: vimdiff: fix layout where REMOTE is the target
119
120
+ Layout configuration in vimdiff backend didn't work as advertised,
121
+ which has been corrected.
122
+ source: <20250325222311.400748-1-greenfoo@u92.eu>
123
75
-* cc/signed-fast-export-import (2025-03-10) 6 commits
76
- (merged to 'next' on 2025-03-18 at d98973e2cb)
77
- + fast-export, fast-import: add support for signed-commits
78
- + fast-export: do not modify memory from get_commit_buffer
79
- + git-fast-export.adoc: clarify why 'verbatim' may not be a good idea
80
- + fast-export: rename --signed-tags='warn' to 'warn-verbatim'
81
- + fast-export: fix missing whitespace after switch
82
- + git-fast-import.adoc: add missing LF in the BNF
124
84
- "git fast-export | git fast-import" learns to deal with commit and
85
- tag objects with embedded signatures a bit better.
86
- cf. <CABPp-BGyA8iBA0BFO8FcpZAMca94aVu2vHHRi4Oz=nCWxJSDPg@mail.gmail.com>
87
- source: <20250310155746.879481-1-christian.couder@gmail.com>
125
+* ja/doc-branch-markup (2025-03-20) 2 commits
126
+ (merged to 'next' on 2025-03-24 at ba6e1c7d0b)
127
+ + doc: apply new format to git-branch man page
128
+ + completion: take into account the formatting backticks for options
129
130
+ Doc mark-up updates.
131
+ source: <pull.1880.v2.git.1742372183.gitgitgadget@gmail.com>
132
90
-* en/diff-rename-follow-fix (2025-03-14) 1 commit
91
- (merged to 'next' on 2025-03-18 at 56808a7eda)
92
- + diffcore-rename: fix BUG when break detection and --follow used together
133
94
- A corner-case bug in "git log --follow -B" has been fixed.
95
- source: <pull.1876.v2.git.1742000894041.gitgitgadget@gmail.com>
134
+* jc/name-rev-stdin (2025-03-12) 6 commits
135
+ (merged to 'next' on 2025-03-24 at cfec2e409f)
136
+ + name-rev: remove "--stdin" support
137
+ + t6120: further modernize
138
+ + t6120: avoid hiding "git" exit status
139
+ + t: introduce WITH_BREAKING_CHANGES prerequisite
140
+ + t: extend test_lazy_prereq
141
+ + t: document test_lazy_prereq
142
143
+ Using "git name-rev --stdin" as an example, improve the framework to
144
+ prepare tests to pretend to be in the future where the breaking
145
+ changes have already happened.
146
+ source: <20250311212505.2920181-1-gitster@pobox.com>
147
98
-* en/merge-ort-prepare-to-remove-recursive (2025-03-18) 6 commits
99
- (merged to 'next' on 2025-03-18 at a911944a1c)
100
- + am: switch from merge_recursive_generic() to merge_ort_generic()
101
- + merge-ort: fix merge.directoryRenames=false
102
- + t3650: document bug when directory renames are turned off
103
- + merge-ort: support having merge verbosity be set to 0
104
- + merge-ort: allow rename detection to be disabled
105
- + merge-ort: add new merge_ort_generic() function
148
107
- First step of deprecating and removing merge-recursive.
108
- source: <pull.1875.v2.git.1741834001.gitgitgadget@gmail.com>
149
+* jh/hash-init-fixes (2025-03-18) 1 commit
150
+ (merged to 'next' on 2025-03-24 at 85b8299403)
151
+ + index-pack, unpack-objects: restore missing ->init_fn
152
+
153
+ An earlier code refactoring of the hash machinery missed a few
154
+ required calls to init_fn.
155
+ cf. <Z9rC0VCbh8Noaq4e@pks.im>
156
+ source: <20250318111616.113941-1-hmz007@gmail.com>
157
158
111
-* en/random-cleanups (2025-03-17) 5 commits
112
- (merged to 'next' on 2025-03-18 at 87acd24a85)
113
- + merge-ort: remove extraneous word in comment
114
- + merge-ort: fix accidental strset<->strintmap
115
- + t7615: be more explicit about diff algorithm used
116
- + t6423: fix a comment that accidentally reversed two commits
117
- + stash: remove merge-recursive.h include
159
+* js/imap-send-peer-cert-verify (2025-03-25) 1 commit
160
+ (merged to 'next' on 2025-03-26 at 69df4dd915)
161
+ + imap-send: explicitly verify the peer certificate
162
119
- Miscellaneous code clean-ups.
120
- source: <pull.1882.git.1742108339.gitgitgadget@gmail.com>
163
+ Will merge to 'master'.
164
+ source: <pull.1886.git.1742819282360.gitgitgadget@gmail.com>
165
166
123
-* es/meson-building-docs-requires-perl (2025-03-17) 1 commit
124
- (merged to 'next' on 2025-03-18 at 1c1d88dcb7)
125
- + meson: fix perl detection when docs are enabled, but perl bindings aren't
167
+* js/mingw-admins-are-special (2025-03-25) 2 commits
168
+ (merged to 'next' on 2025-03-26 at dfcb9661a6)
169
+ + test-tool path-utils: support debugging "dubious ownership" issues
170
+ + mingw: special-case administrators even more
171
127
- Build update.
128
- source: <20250316060605.166364-1-eschwartz@gentoo.org>
172
+ "Dubious ownership" checks on Windows has been tightened up.
173
+ source: <pull.1893.git.1742899110.gitgitgadget@gmail.com>
174
175
131
-* hj/doc-rev-list-ancestry-fix (2025-03-18) 1 commit
132
- (merged to 'next' on 2025-03-18 at e94155a9ec)
133
- + doc: add missing commit C to the graph for --ancestry-path=H D..M
176
+* kn/ci-meson-check-build-docs-fix (2025-03-20) 1 commit
177
+ (merged to 'next' on 2025-03-24 at 135ce9ce61)
178
+ + ci/github: add missing 'CI_JOB_IMAGE' env variable
179
135
- Doc update.
136
- source: <pull.1883.git.1742089659610.gitgitgadget@gmail.com>
137
-
138
-
139
-* jk/fetch-ref-prefix-cleanup (2025-03-10) 9 commits
140
- (merged to 'next' on 2025-03-18 at ab3e5cf19f)
141
- + fetch: use ref prefix list to skip ls-refs
142
- + fetch: avoid ls-refs only to ask for HEAD symref update
143
- + fetch: stop protecting additions to ref-prefix list
144
- + fetch: ask server to advertise HEAD for config-less fetch
145
- + refspec_ref_prefixes(): clean up refspec_item logic
146
- + t5516: beef up exact-oid ref prefixes test
147
- + t5516: drop NEEDSWORK about v2 reachability behavior
148
- + t5516: prefer "oid" to "sha1" in some test titles
149
- + t5702: fix typo in test name
150
- (this branch is used by jk/fetch-follow-remote-head-fix and tb/refspec-fetch-cleanup.)
151
-
152
- In protocol v2 where the refs advertisement is constrained, we try
153
- to tell the server side not to limit the advertisement when there
154
- is no specific need to, which has been the source of confusion and
155
- recent bugs. Revamp the logic to simplify.
156
- source: <20250309030101.GA2334064@coredump.intra.peff.net>
157
-
158
-
159
-* jk/use-wunreachable-code-for-devs (2025-03-17) 3 commits
160
- (merged to 'next' on 2025-03-18 at fe32168eef)
161
- + config.mak.dev: enable -Wunreachable-code
162
- + git-compat-util: add NOT_CONSTANT macro and use it in atfork_prepare()
163
- + run-command: use errno to check for sigfillset() error
164
-
165
- Enable -Wunreachable-code for developer builds.
166
- source: <20250317235329.809302-1-gitster@pobox.com>
167
-
168
-
169
-* ps/meson-with-breaking-changes (2025-03-12) 3 commits
170
- (merged to 'next' on 2025-03-18 at 15b1c62eff)
171
- + meson: don't install git-pack-redundant(1) docs with breaking changes
172
- + meson: don't compile git-pack-redundant(1) with breaking changes
173
- + meson: define WITH_BREAKING_CHANGES when enabling breaking changes
174
-
175
- Update meson based build procedure for breaking changes support.
176
- source: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im>
177
-
178
-
179
-* ps/refname-avail-check-optim (2025-03-12) 16 commits
180
- (merged to 'next' on 2025-03-18 at 726197f7e0)
181
- + refs: reuse iterators when determining refname availability
182
- + refs/iterator: implement seeking for files iterators
183
- + refs/iterator: implement seeking for packed-ref iterators
184
- + refs/iterator: implement seeking for ref-cache iterators
185
- + refs/iterator: implement seeking for reftable iterators
186
- + refs/iterator: implement seeking for merged iterators
187
- + refs/iterator: provide infrastructure to re-seek iterators
188
- + refs/iterator: separate lifecycle from iteration
189
- + refs: stop re-verifying common prefixes for availability
190
- + refs/files: batch refname availability checks for initial transactions
191
- + refs/files: batch refname availability checks for normal transactions
192
- + refs/reftable: batch refname availability checks
193
- + refs: introduce function to batch refname availability checks
194
- + builtin/update-ref: skip ambiguity checks when parsing object IDs
195
- + object-name: allow skipping ambiguity checks in `get_oid()` family
196
- + object-name: introduce `repo_get_oid_with_flags()`
197
- (this branch is used by kn/non-transactional-batch-updates.)
198
-
199
- The code paths to check whether a refname X is available (by seeing
200
- if another ref X/Y exists, etc.) have been optimized.
201
- source: <20250312-pks-update-ref-optimization-v6-0-f778e0414f55@pks.im>
202
-
203
-
204
-* rs/xdiff-context-length-fix (2025-03-14) 1 commit
205
- (merged to 'next' on 2025-03-18 at aca4b320d2)
206
- + xdiff: avoid arithmetic overflow in xdl_get_hunk()
207
-
208
- The xdiff code on 32-bit platform misbehaved when an insanely large
209
- context size is given, which has been corrected.
210
- source: <4e9b6b4c-aaa1-4c6f-93f4-7bb04607e843@web.de>
211
-
212
-
213
-* tb/multi-cruft-pack-refresh-fix (2025-03-13) 1 commit
214
- (merged to 'next' on 2025-03-18 at e3f090e427)
215
- + builtin/pack-objects.c: freshen objects from existing cruft packs
216
- (this branch is used by tb/combine-cruft-below-size.)
217
-
218
- Certain "cruft" objects would have never been refreshed when there
219
- are multiple cruft packs in the repository, which has been
180
+ GitHub Actions CI switched on a CI/CD variable that does not exist
181
+ when choosing what packages to install etc., which has been
182
corrected.
221
- source: <1563552bbda0bc910c9f41b0fabc3225c4d778fc.1741889018.git.me@ttaylorr.com>
183
+ source: <20250319163328.525284-1-karthik.188@gmail.com>
184
+
185
+
186
+* ms/reftable-block-writer-errors (2025-03-21) 3 commits
187
+ (merged to 'next' on 2025-03-29 at 67fdddb622)
188
+ + reftable: adapt write_object_record() to propagate block_writer_add() errors
189
+ + reftable: adapt writer_add_record() to propagate block_writer_add() errors
190
+ + reftable: propagate specific error codes in block_writer_add()
191
+
192
+ Give more meaningful error return values from block writer layer of
193
+ the reftable ref-API backend.
194
+ cf. <Z9rnZzbEasyRbHIY@pks.im>
195
+ source: <20250319152927.1263033-1-meetsoni3017@gmail.com>
196
+
197
+
198
+* ps/ci-meson-check-build-docs (2025-03-12) 1 commit
199
+ (merged to 'next' on 2025-03-29 at 5aed226a96)
200
+ + ci: perform build and smoke tests for Meson docs
201
+
202
+ CI update.
203
+ source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>
204
+
205
+
206
+* ps/reftable-sans-compat-util (2025-02-18) 18 commits
207
+ (merged to 'next' on 2025-03-29 at 4e9fbae111)
208
+ + Makefile: skip reftable library for Coccinelle
209
+ + reftable: decouple from Git codebase by pulling in "compat/posix.h"
210
+ + git-compat-util.h: split out POSIX-emulating bits
211
+ + compat/mingw: split out POSIX-related bits
212
+ + reftable/basics: introduce `REFTABLE_UNUSED` annotation
213
+ + reftable/basics: stop using `SWAP()` macro
214
+ + reftable/stack: stop using `sleep_millisec()`
215
+ + reftable/system: introduce `reftable_rand()`
216
+ + reftable/reader: stop using `ARRAY_SIZE()` macro
217
+ + reftable/basics: provide wrappers for big endian conversion
218
+ + reftable/basics: stop using `st_mult()` in array allocators
219
+ + reftable: stop using `BUG()` in trivial cases
220
+ + reftable/record: don't `BUG()` in `reftable_record_cmp()`
221
+ + reftable/record: stop using `BUG()` in `reftable_record_init()`
222
+ + reftable/record: stop using `COPY_ARRAY()`
223
+ + reftable/blocksource: stop using `xmmap()`
224
+ + reftable/stack: stop using `write_in_full()`
225
+ + reftable/stack: stop using `read_in_full()`
226
+ (this branch is used by ps/reftable-api-revamp and ps/reftable-windows-unlink-fix.)
227
+
228
+ Make the code in reftable library less reliant on the service
229
+ routines it used to borrow from Git proper, to make it easier to
230
+ use by external users of the library.
231
+ cf. <Z-Y1YbE2EVqLZhGO@pks.im>
232
+ source: <20250218-pks-reftable-drop-git-compat-util-v6-0-8c1f39fb4c02@pks.im>
233
+
234
+
235
+* pw/build-breaking-changes-doc (2025-03-18) 1 commit
236
+ (merged to 'next' on 2025-03-24 at 56efeea47e)
237
+ + docs: add BreakingChanges to TECH_DOCS target
238
+
239
+ A documentation page was left out from formatting and installation,
240
+ which has been corrected.
241
+ source: <pull.1921.git.git.1742308900290.gitgitgadget@gmail.com>
242
+
243
+
244
+* pw/doc-pack-refs-markup-fix (2025-03-18) 1 commit
245
+ (merged to 'next' on 2025-03-24 at 3bcea36a83)
246
+ + pack-refs doc: fix indentation for --exclude
247
+
248
+ Doc markup fix.
249
+ source: <pull.1920.git.git.1742308828163.gitgitgadget@gmail.com>
250
+
251
+
252
+* rs/clear-commit-marks-simplify (2025-03-24) 1 commit
253
+ (merged to 'next' on 2025-03-29 at 222799fc4e)
254
+ + commit: move clear_commit_marks_many() loop body to clear_commit_marks()
255
+
256
+ Code clean-up.
257
+ source: <80bfd7a9-904c-49d8-a367-ca268c096a9f@web.de>
258
+
259
+
260
+* ta/bulk-checkin-signed-compare-false-warning-fix (2025-03-25) 1 commit
261
+ (merged to 'next' on 2025-03-29 at 6f33c692ce)
262
+ + bulk-checkin: fix sign compare warnings
263
+
264
+ Compiler warnings workaround.
265
+ source: <20250324214703.7547-1-taahol@utu.fi>
266
+
267
+
268
+* tb/bitamp-typofix (2025-03-21) 1 commit
269
+ (merged to 'next' on 2025-03-26 at f068ddb5bb)
270
+ + pseudo-merge.h: fix a typo
271
+
272
+ Typofix.
273
+ source: <3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com>
274
+
275
+
276
+* tb/combine-cruft-below-size (2025-03-21) 6 commits
277
+ (merged to 'next' on 2025-03-24 at 699b83a925)
278
+ + repack: begin combining cruft packs with `--combine-cruft-below-size`
279
+ + repack: avoid combining cruft packs with `--max-cruft-size`
280
+ + t/t7704-repack-cruft.sh: consolidate `write_blob()`
281
+ + t/t7704-repack-cruft.sh: clarify wording in --max-cruft-size tests
282
+ + t/t5329-pack-objects-cruft.sh: evict 'repack'-related tests
283
+ + Merge branch 'tb/multi-cruft-pack-refresh-fix' into tb/combine-cruft-below-size
284
+
285
+ "git repack" learned "--combine-cruft-below-size" option that
286
+ controls how cruft-packs are combined.
287
+ source: <cover.1742424671.git.me@ttaylorr.com>
288
+
289
+
290
+* tb/http-curl-keepalive (2025-03-21) 4 commits
291
+ (merged to 'next' on 2025-03-29 at 4782cca658)
292
+ + http.c: allow custom TCP keepalive behavior via config
293
+ + http.c: inline `set_curl_keepalive()`
294
+ + http.c: introduce `set_long_from_env()` for convenience
295
+ + http.c: remove unnecessary casts to long
296
+
297
+ TCP keepalive behaviour on http transports can now be configured by
298
+ calling cURL library.
299
+ cf. <CABPp-BEn+NfGu1c=ZWjwnFBJgmsxRVSq+Roin-KDQGqKPdDhCg@mail.gmail.com>
300
+ source: <cover.1742423021.git.me@ttaylorr.com>
301
+
302
+
303
+* tb/incremental-midx-part-2 (2025-03-21) 14 commits
304
+ (merged to 'next' on 2025-03-29 at 1db17d1a9b)
305
+ + midx: implement writing incremental MIDX bitmaps
306
+ + pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators
307
+ + pack-bitmap.c: keep track of each layer's type bitmaps
308
+ + ewah: implement `struct ewah_or_iterator`
309
+ + pack-bitmap.c: apply pseudo-merge commits with incremental MIDXs
310
+ + pack-bitmap.c: compute disk-usage with incremental MIDXs
311
+ + pack-bitmap.c: teach `rev-list --test-bitmap` about incremental MIDXs
312
+ + pack-bitmap.c: support bitmap pack-reuse with incremental MIDXs
313
+ + pack-bitmap.c: teach `show_objects_for_type()` about incremental MIDXs
314
+ + pack-bitmap.c: teach `bitmap_for_commit()` about incremental MIDXs
315
+ + pack-bitmap.c: open and store incremental bitmap layers
316
+ + pack-revindex: prepare for incremental MIDX bitmaps
317
+ + Documentation: describe incremental MIDX bitmaps
318
+ + Documentation: remove a "future work" item from the MIDX docs
319
+ (this branch is used by ps/cat-file-filter-batch.)
320
+
321
+ Incrementally updating multi-pack index files.
322
+ source: <cover.1742493373.git.me@ttaylorr.com>
323
+
324
+
325
+* tb/refspec-fetch-cleanup (2025-03-21) 5 commits
326
+ (merged to 'next' on 2025-03-29 at 6cf1359bf4)
327
+ + refspec: replace `refspec_item_init()` with fetch/push variants
328
+ + refspec: remove refspec_item_init_or_die()
329
+ + refspec: replace `refspec_init()` with fetch/push variants
330
+ + refspec: treat 'fetch' as a Boolean value
331
+ + Merge branch 'jk/fetch-ref-prefix-cleanup' into tb/refspec-fetch-cleanup
332
+
333
+ Code clean-up.
334
+ cf. <CABPp-BE6JmiXB+pUL1Z4ewVDbG2RBxCdA2m5-WTYtoKMTtu_Xw@mail.gmail.com>
335
+ source: <cover.1742338207.git.me@ttaylorr.com>
336
337
--------------------------------------------------
224
-[New Topics]
338
+[Cooking]
339
340
* js/range-check-codeql-workaround (2025-03-28) 1 commit
341
- read-cache: check range before dereferencing an array element
@@ -232,26 +346,28 @@ Release tarballs are available at:
346
source: <73cae30129338cf219a810c3a2a78ef48d5637d0.1743073557.git.gitgitgadget@gmail.com>
347
348
235
-* jt/help-sha-backend-info-in-build-options (2025-03-28) 2 commits
236
- - help: include unsafe SHA-1 build info in version
237
- - help: include SHA implementation in version info
349
+* jt/help-sha-backend-info-in-build-options (2025-04-07) 2 commits
350
+ (merged to 'next' on 2025-04-08 at 7389752293)
351
+ + help: include unsafe SHA-1 build info in version
352
+ + help: include SHA implementation in version info
353
354
"git help --build-options" reports SHA-1 and SHA-256 backends used
355
in the build.
356
242
- Need to pick up a newer iteration.
243
- cf. <20250403140529.497876-1-jltobler@gmail.com>
244
- source: <20250328170121.157563-1-jltobler@gmail.com>
357
+ Will merge to 'master'.
358
+ source: <20250403140529.497876-1-jltobler@gmail.com>
359
360
361
* pb/perf-test-fixes (2025-03-28) 2 commits
248
- - p9210: fix 'scalar clone' when running from a detached HEAD
249
- - p7821: fix test_perf invocation for prereqs
362
+ (merged to 'next' on 2025-04-08 at a8aaeee41e)
363
+ + p9210: fix 'scalar clone' when running from a detached HEAD
364
+ + p7821: fix test_perf invocation for prereqs
365
366
"make perf" fixes.
367
253
- Will merge to 'next'?
368
+ Will merge to 'master'.
369
cf. <Z-pD1puYT87YKAd4@pks.im>
370
+ cf. <Z_TAtJ9LEeHo2AQN@pks.im>
371
source: <pull.1936.git.git.1743181669.gitgitgadget@gmail.com>
372
373
@@ -268,103 +384,105 @@ Release tarballs are available at:
384
source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>
385
386
271
-* ps/cat-file-filter-batch (2025-03-28) 11 commits
272
- - builtin/cat-file: use bitmaps to efficiently filter by object type
273
- - builtin/cat-file: deduplicate logic to iterate over all objects
274
- - pack-bitmap: introduce function to check whether a pack is bitmapped
275
- - pack-bitmap: add function to iterate over filtered bitmapped objects
276
- - pack-bitmap: allow passing payloads to `show_reachable_fn()`
277
- - builtin/cat-file: support "object:type=" objects filter
278
- - builtin/cat-file: support "blob:limit=" objects filter
279
- - builtin/cat-file: support "blob:none" objects filter
280
- - builtin/cat-file: wire up an option to filter objects
281
- - builtin/cat-file: rename variable that tracks usage
282
- - Merge branch 'tb/incremental-midx-part-2' into ps/cat-file-filter-batch
283
- (this branch uses tb/incremental-midx-part-2.)
387
+* ps/cat-file-filter-batch (2025-04-07) 12 commits
388
+ (merged to 'next' on 2025-04-08 at eb8dfb17ea)
389
+ + builtin/cat-file: use bitmaps to efficiently filter by object type
390
+ + builtin/cat-file: deduplicate logic to iterate over all objects
391
+ + pack-bitmap: introduce function to check whether a pack is bitmapped
392
+ + pack-bitmap: add function to iterate over filtered bitmapped objects
393
+ + pack-bitmap: allow passing payloads to `show_reachable_fn()`
394
+ + builtin/cat-file: support "object:type=" objects filter
395
+ + builtin/cat-file: support "blob:limit=" objects filter
396
+ + builtin/cat-file: support "blob:none" objects filter
397
+ + builtin/cat-file: wire up an option to filter objects
398
+ + builtin/cat-file: introduce function to report object status
399
+ + builtin/cat-file: rename variable that tracks usage
400
+ + Merge branch 'tb/incremental-midx-part-2' into ps/cat-file-filter-batch
401
402
"git cat-file --batch" and friends learned to allow "--filter=" to
403
omit certain objects, just like the transport layer does.
404
288
- Need to pick up a newer iteration.
289
- cf. <20250402-pks-cat-file-object-type-filter-v3-0-4da6bb21871c@pks.im>
290
- source: <20250327-pks-cat-file-object-type-filter-v2-0-4bbc7085d7c5@pks.im>
405
+ Will merge to 'master'.
406
+ source: <20250402-pks-cat-file-object-type-filter-v3-0-4da6bb21871c@pks.im>
407
408
409
* ps/misc-build-fixes (2025-04-01) 5 commits
294
- - ci: use Visual Studio for win+meson job on GitHub Workflows
295
- - meson: distinguish build and target host binaries
296
- - meson: respect 'tests' build option in contrib
297
- - gitweb: fix generation of "gitweb.js"
298
- - meson: fix handling of '-Dcurl=auto'
410
+ (merged to 'next' on 2025-04-08 at 85693b6d96)
411
+ + ci: use Visual Studio for win+meson job on GitHub Workflows
412
+ + meson: distinguish build and target host binaries
413
+ + meson: respect 'tests' build option in contrib
414
+ + gitweb: fix generation of "gitweb.js"
415
+ + meson: fix handling of '-Dcurl=auto'
416
417
Random build fixes.
418
302
- Will merge to 'next'?
419
+ Will merge to 'master'.
420
cf. <CAOLa=ZQ8bTn-prAs2ycLdLLjVaLQL4GtLw_gFsvAcx_6j=MBjA@mail.gmail.com>
421
source: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im>
422
423
307
-* ps/test-wo-perl-prereq (2025-03-28) 20 commits
308
- - t5703: refactor test to not depend on Perl
309
- - t5316: refactor `max_chain()` to not depend on Perl
310
- - t0210: refactor trace2 scrubbing to not use Perl
311
- - t0021: refactor `generate_random_characters()` to not depend on Perl
312
- - t/lib-httpd: refactor "one-time-perl" CGI script to not depend on Perl
313
- - t/lib-t6000: refactor `name_from_description()` to not depend on Perl
314
- - t/lib-gpg: refactor `sanitize_pgp()` to not depend on Perl
315
- - t: refactor tests depending on Perl for textconv scripts
316
- - t: refactor tests depending on Perl to print data
317
- - t: refactor tests depending on Perl substitution operator
318
- - t: refactor tests depending on Perl transliteration operator
319
- - Makefile: stop requiring Perl when running tests
320
- - meson: stop requiring Perl when tests are enabled
321
- - t: adapt existing PERL prerequisites
322
- - t: introduce PERL_TEST_HELPERS prerequisite
323
- - t: adapt `test_readlink()` to not use Perl
324
- - t: adapt `test_copy_bytes()` to not use Perl
325
- - t: adapt character translation helpers to not use Perl
326
- - t: refactor environment sanitization to not use Perl
327
- - t: skip chain lint when PERL_PATH is unset
424
+* ps/test-wo-perl-prereq (2025-04-07) 20 commits
425
+ (merged to 'next' on 2025-04-08 at 424e2eab23)
426
+ + t5703: refactor test to not depend on Perl
427
+ + t5316: refactor `max_chain()` to not depend on Perl
428
+ + t0210: refactor trace2 scrubbing to not use Perl
429
+ + t0021: refactor `generate_random_characters()` to not depend on Perl
430
+ + t/lib-httpd: refactor "one-time-perl" CGI script to not depend on Perl
431
+ + t/lib-t6000: refactor `name_from_description()` to not depend on Perl
432
+ + t/lib-gpg: refactor `sanitize_pgp()` to not depend on Perl
433
+ + t: refactor tests depending on Perl for textconv scripts
434
+ + t: refactor tests depending on Perl to print data
435
+ + t: refactor tests depending on Perl substitution operator
436
+ + t: refactor tests depending on Perl transliteration operator
437
+ + Makefile: stop requiring Perl when running tests
438
+ + meson: stop requiring Perl when tests are enabled
439
+ + t: adapt existing PERL prerequisites
440
+ + t: introduce PERL_TEST_HELPERS prerequisite
441
+ + t: adapt `test_readlink()` to not use Perl
442
+ + t: adapt `test_copy_bytes()` to not use Perl
443
+ + t: adapt character translation helpers to not use Perl
444
+ + t: refactor environment sanitization to not use Perl
445
+ + t: skip chain lint when PERL_PATH is unset
446
447
"make test" used to have a hard dependency on (basic) Perl; tests
448
have been rewritten help environment with NO_PERL test the build as
449
much as possible.
450
333
- Need to pick up a newer iteration.
334
- cf. <20250327-b4-pks-t-perlless-v3-0-b436de9da1b8@pks.im>
335
- source: <20250327-b4-pks-t-perlless-v3-0-b436de9da1b8@pks.im>
451
+ Will merge to 'master'.
452
+ source: <20250403-b4-pks-t-perlless-v4-0-be20ac3db39a@pks.im>
453
454
455
* pw/custom-conflict-marker-size-for-merge-related-docs (2025-03-29) 1 commit
339
- - merge-file doc: set conflict-marker-size attribute
456
+ (merged to 'next' on 2025-04-07 at 281b7207e3)
457
+ + merge-file doc: set conflict-marker-size attribute
458
459
"git-merge-file" documentation source, which has lines that look
460
like conflict markers, lacked custom conflict marker size defined,
461
which has been corrected..
462
345
- Will merge to 'next'.
463
+ Will merge to 'master'.
464
source: <pull.1895.git.1743173140253.gitgitgadget@gmail.com>
465
466
467
* ab/rm-sign-compare (2025-03-29) 1 commit
350
- - rm: fix sign comparison warnings
468
+ (merged to 'next' on 2025-04-08 at bc1f98e81c)
469
+ + rm: fix sign comparison warnings
470
471
Some warnings from "-Wsign-compare" for builtin/rm.c have been
472
squelched.
473
355
- Will merge to 'next'.
474
+ Will merge to 'master'.
475
source: <ecaaa968-f337-466b-b719-22ebb3587167@gmail.com>
476
477
359
-* kn/blame-porcelain-unblamable (2025-03-29) 1 commit
478
+* kn/blame-porcelain-unblamable (2025-04-07) 1 commit
479
- blame: print unblamable and ignored commits in porcelain mode
480
481
"git blame --porcelain" mode now talks about unblamable lines and
482
lines that are blamed to an ignored commit.
483
365
- Need to pick up a newer iteration.
366
- cf. <20250403160326.120124-1-karthik.188@gmail.com>
367
- source: <20250329-514-git-blame-1-s-porcelain-output-does-not-emit-unblamable-and-ignored-markers-v3-1-10f695ae519a@gmail.com>
484
+ Will merge to 'next'.
485
+ source: <20250403160326.120124-1-karthik.188@gmail.com>
486
487
488
* ua/update-update-server-info (2025-03-29) 1 commit
@@ -376,25 +494,27 @@ Release tarballs are available at:
494
495
496
* ab/pathspec-sign-compare-workaround (2025-04-01) 1 commit
379
- - pathspec: fix sign comparison warnings
497
+ (merged to 'next' on 2025-04-08 at 875fb0e3ee)
498
+ + pathspec: fix sign comparison warnings
499
500
Some warnings from "-Wsign-compare" for pathspec.c have been
501
squelched.
383
-
384
- Will merge to 'next'?
502
+
503
+ Will merge to 'master'.
504
source: <127c3010-4b23-436e-a07d-e6031e746113@gmail.com>
505
506
507
* bc/allow-upload-pack-from-other-people (2025-04-01) 1 commit
389
- - t5605: fix test for cloning from a different user
508
+ (merged to 'next' on 2025-04-07 at c27755834e)
509
+ + t5605: fix test for cloning from a different user
510
511
Test fix for an already graduated topic.
512
393
- Will merge to 'next'.
513
+ Will merge to 'master'.
514
source: <Z-sO9gcWAi_xh0tI@tapette.crustytoothpaste.net>
515
516
397
-* en/merge-recursive-debug (2025-04-01) 8 commits
517
+* en/merge-recursive-debug (2025-04-07) 8 commits
518
- builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM
519
- tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
520
- merge-recursive.[ch]: thoroughly debug these
@@ -404,9 +524,9 @@ Release tarballs are available at:
524
- builtin/merge-recursive: switch to using merge_ort_generic()
525
- checkout: replace merge_trees() with merge_ort_nonrecursive()
526
407
- Need to pick up a newer iteration.
408
- cf. <pull.1898.v2.git.1743891374.gitgitgadget@gmail.com>
409
- source: <pull.1898.git.1743436279.gitgitgadget@gmail.com>
527
+ Expecting a reroll.
528
+ cf. <CABPp-BGN2JCt9BJ0wQqtgNLhD6Qf19PMzYWpjgpJ6O2OcyRCXg@mail.gmail.com>
529
+ source: <pull.1898.v2.git.1743891374.gitgitgadget@gmail.com>
530
531
532
* ja/doc-reset-mv-rm-markup-updates (2025-04-01) 5 commits
@@ -416,7 +536,6 @@ Release tarballs are available at:
536
- doc: fix synopsis analysis logic
537
- doc: convert git-reset to new documentation format
538
419
-
539
Expecting a reroll.
540
cf. <CAN0heSodC8_Uwg_Lw31rtkdLfOEDyGg=iE0gb1TRrUWQEynT+w@mail.gmail.com>
541
cf. <dfe21538-e70c-4d19-a90f-2c3cf8d3d377@free.fr>
@@ -443,10 +562,9 @@ Release tarballs are available at:
562
source: <20250330112850.2477673-1-m@lfurio.us>
563
564
446
-* ps/reftable-api-revamp (2025-04-01) 18 commits
565
+* ps/reftable-api-revamp (2025-04-07) 17 commits
566
- reftable/table: move printing logic into test helper
567
- reftable/constants: make block types part of the public interface
449
- - SQUASH???
568
- reftable/table: introduce iterator for table blocks
569
- reftable/table: add `reftable_table` to the public interface
570
- reftable/block: expose a generic iterator over reftable records
@@ -462,335 +580,116 @@ Release tarballs are available at:
580
- reftable/reader: rename data structure to "table"
581
- reftable: fix formatting of the license header
582
- Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-api-revamp
465
- (this branch uses ps/reftable-sans-compat-util.)
466
-
467
- Need to pick up a newer iteration.
468
- cf. <20250407-pks-reftable-polishing-v2-0-316c4ff10571@pks.im>
469
- source: <20250331-pks-reftable-polishing-v1-0-ebed5247434c@pks.im>
470
-
471
---------------------------------------------------
472
-[Cooking]
473
-
474
-* ds/maintenance-loose-objects-batchsize (2025-03-23) 2 commits
475
- - maintenance: add loose-objects.batchSize config
476
- - maintenance: force progress/no-quiet to children
477
-
478
- The job to coalesce loose objects into packfiles in "git
479
- maintenance" now has configurable batch size.
480
-
481
- Will merge to 'next'.
482
- source: <pull.1885.git.1742777512.gitgitgadget@gmail.com>
483
-
484
-
485
-* jt/clone-guess-remote-head-fix (2025-03-25) 3 commits
486
- - advice: allow disabling default branch name advice
487
- - builtin/clone: suppress unexpected default branch advice
488
- - remote: allow `guess_remote_head()` to suppress advice
489
-
490
- "git clone" still gave the message about the default branch name;
491
- this message has been turned into an advice message that can be
492
- turned off.
493
-
494
- Will merge to 'next'.
495
- cf. <69ccc682-3f81-440f-8e96-a5af5d49fa60@gmail.com>
496
- source: <20250325005148.1771502-1-jltobler@gmail.com>
497
-
498
-
499
-* lo/userdiff-gitconfig (2025-04-01) 1 commit
500
- - userdiff: add builtin driver for INI files
501
-
502
- Will merge to 'next'.
503
- cf. <Z-pGdyh0eG3xSe4W@pks.im>
504
- source: <20250331031309.94682-1-lucasseikioshiro@gmail.com>
505
-
506
-
507
-* rs/clear-commit-marks-simplify (2025-03-24) 1 commit
508
- (merged to 'next' on 2025-03-29 at 222799fc4e)
509
- + commit: move clear_commit_marks_many() loop body to clear_commit_marks()
510
-
511
- Code clean-up.
512
-
513
- Will merge to 'master'.
514
- source: <80bfd7a9-904c-49d8-a367-ca268c096a9f@web.de>
515
-
516
-
517
-* ta/bulk-checkin-signed-compare-false-warning-fix (2025-03-25) 1 commit
518
- (merged to 'next' on 2025-03-29 at 6f33c692ce)
519
- + bulk-checkin: fix sign compare warnings
520
-
521
- Compiler warnings workaround.
522
-
523
- Will merge to 'master'.
524
- source: <20250324214703.7547-1-taahol@utu.fi>
525
-
526
-
527
-* dk/vimdiff-doc-fix (2025-03-25) 1 commit
528
- (merged to 'next' on 2025-03-29 at d0c7a36752)
529
- + vimdiff: clarify the sigil used for marking the buffer to save
530
-
531
- Doc update.
532
-
533
- Will merge to 'master'.
534
- source: <20250324205327.79627-1-ben.knoble+github@gmail.com>
535
-
536
-
537
-* es/meson-build-skip-coccinelle (2025-03-25) 1 commit
538
- (merged to 'next' on 2025-03-29 at 748d830ce7)
539
- + meson: disable coccinelle configuration when building from a tarball
540
-
541
- Build fix.
542
-
543
- Will merge to 'master'.
544
- source: <20250325200920.198057-1-eschwartz@gentoo.org>
545
-
546
-
547
-* fr/vimdiff-layout-fixes (2025-03-25) 2 commits
548
- (merged to 'next' on 2025-03-29 at 367b2105c0)
549
- + mergetools: vimdiff: add tests for layout with REMOTE as the target
550
- + mergetools: vimdiff: fix layout where REMOTE is the target
551
-
552
- Layout configuration in vimdiff backend didn't work as advertised,
553
- which has been corrected.
554
-
555
- Will merge to 'master'.
556
- source: <20250325222311.400748-1-greenfoo@u92.eu>
557
-
558
-
559
-* js/comma-semicolon-confusion (2025-03-28) 10 commits
560
- - detect-compiler: detect clang even if it found CUDA
561
- - clang: warn when the comma operator is used
562
- - compat/regex: explicitly mark intentional use of the comma operator
563
- - wildmatch: avoid using of the comma operator
564
- - diff-delta: avoid using the comma operator
565
- - xdiff: avoid using the comma operator unnecessarily
566
- - clar: avoid using the comma operator unnecessarily
567
- - kwset: avoid using the comma operator unnecessarily
568
- - rebase: avoid using the comma operator unnecessarily
569
- - remote-curl: avoid using the comma operator unnecessarily
570
-
571
- Code clean-up.
572
-
573
- Will merge to 'next'.
574
- source: <pull.1889.v3.git.1743076383.gitgitgadget@gmail.com>
575
-
576
-
577
-* js/imap-send-peer-cert-verify (2025-03-25) 1 commit
578
- (merged to 'next' on 2025-03-26 at 69df4dd915)
579
- + imap-send: explicitly verify the peer certificate
580
-
581
- Will merge to 'master'.
582
- source: <pull.1886.git.1742819282360.gitgitgadget@gmail.com>
583
-
584
-
585
-* js/mingw-admins-are-special (2025-03-25) 2 commits
586
- (merged to 'next' on 2025-03-26 at dfcb9661a6)
587
- + test-tool path-utils: support debugging "dubious ownership" issues
588
- + mingw: special-case administrators even more
589
-
590
- "Dubious ownership" checks on Windows has been tightened up.
591
-
592
- Will merge to 'master'.
593
- source: <pull.1893.git.1742899110.gitgitgadget@gmail.com>
594
-
595
-
596
-* en/assert-wo-side-effects (2025-03-21) 3 commits
597
- (merged to 'next' on 2025-03-29 at de89bb3075)
598
- + treewide: replace assert() with ASSERT() in special cases
599
- + ci: add build checking for side-effects in assert() calls
600
- + git-compat-util: introduce ASSERT() macro
601
-
602
- Ensure what we write in assert() does not have side effects,
603
- and introduce ASSERT() macro to mark those that cannot be
604
- mechanically checked for lack of side effects.
605
-
606
- Will merge to 'master'.
607
- source: <pull.1881.v3.git.1742401378.gitgitgadget@gmail.com>
608
-
609
-
610
-* jt/ref-transaction-abort-fix (2025-03-21) 1 commit
611
- - builtin/fetch: avoid aborting closed reference transaction
612
-
613
- A ref transaction corner case fix.
614
-
615
- Will merge to 'next'.
616
- cf. <Z-E2ns9VziejSLB2@pks.im>
617
- source: <20250321004437.505461-1-jltobler@gmail.com>
618
-
619
-
620
-* kn/ci-meson-check-build-docs-fix (2025-03-20) 1 commit
621
- (merged to 'next' on 2025-03-24 at 135ce9ce61)
622
- + ci/github: add missing 'CI_JOB_IMAGE' env variable
623
-
624
- GitHub Actions CI switched on a CI/CD variable that does not exist
625
- when choosing what packages to install etc., which has been
626
- corrected.
627
-
628
- Will merge to 'master'.
629
- source: <20250319163328.525284-1-karthik.188@gmail.com>
583
584
+ Comments?
585
+ source: <20250407-pks-reftable-polishing-v2-0-316c4ff10571@pks.im>
586
632
-* ms/reftable-block-writer-errors (2025-03-21) 3 commits
633
- (merged to 'next' on 2025-03-29 at 67fdddb622)
634
- + reftable: adapt write_object_record() to propagate block_writer_add() errors
635
- + reftable: adapt writer_add_record() to propagate block_writer_add() errors
636
- + reftable: propagate specific error codes in block_writer_add()
587
638
- Give more meaningful error return values from block writer layer of
639
- the reftable ref-API backend.
588
+* ds/maintenance-loose-objects-batchsize (2025-03-23) 2 commits
589
+ (merged to 'next' on 2025-04-07 at a4e55af4bc)
590
+ + maintenance: add loose-objects.batchSize config
591
+ + maintenance: force progress/no-quiet to children
592
+
593
+ The job to coalesce loose objects into packfiles in "git
594
+ maintenance" now has configurable batch size.
595
596
Will merge to 'master'.
642
- cf. <Z9rnZzbEasyRbHIY@pks.im>
643
- source: <20250319152927.1263033-1-meetsoni3017@gmail.com>
597
+ source: <pull.1885.git.1742777512.gitgitgadget@gmail.com>
598
599
646
-* tb/bitamp-typofix (2025-03-21) 1 commit
647
- (merged to 'next' on 2025-03-26 at f068ddb5bb)
648
- + pseudo-merge.h: fix a typo
600
+* jt/clone-guess-remote-head-fix (2025-03-25) 3 commits
601
+ (merged to 'next' on 2025-04-07 at 35793fd7d8)
602
+ + advice: allow disabling default branch name advice
603
+ + builtin/clone: suppress unexpected default branch advice
604
+ + remote: allow `guess_remote_head()` to suppress advice
605
650
- Typofix.
606
+ "git clone" still gave the message about the default branch name;
607
+ this message has been turned into an advice message that can be
608
+ turned off.
609
610
Will merge to 'master'.
653
- source: <3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com>
654
-
611
+ cf. <69ccc682-3f81-440f-8e96-a5af5d49fa60@gmail.com>
612
+ source: <20250325005148.1771502-1-jltobler@gmail.com>
613
656
-* tb/http-curl-keepalive (2025-03-21) 4 commits
657
- (merged to 'next' on 2025-03-29 at 4782cca658)
658
- + http.c: allow custom TCP keepalive behavior via config
659
- + http.c: inline `set_curl_keepalive()`
660
- + http.c: introduce `set_long_from_env()` for convenience
661
- + http.c: remove unnecessary casts to long
614
663
- TCP keepalive behaviour on http transports can now be configured by
664
- calling cURL library.
615
+* lo/userdiff-gitconfig (2025-04-01) 1 commit
616
+ (merged to 'next' on 2025-04-07 at 1b906232a1)
617
+ + userdiff: add builtin driver for INI files
618
619
Will merge to 'master'.
667
- cf. <CABPp-BEn+NfGu1c=ZWjwnFBJgmsxRVSq+Roin-KDQGqKPdDhCg@mail.gmail.com>
668
- source: <cover.1742423021.git.me@ttaylorr.com>
620
+ cf. <Z-pGdyh0eG3xSe4W@pks.im>
621
+ source: <20250331031309.94682-1-lucasseikioshiro@gmail.com>
622
623
671
-* tb/refspec-fetch-cleanup (2025-03-21) 5 commits
672
- (merged to 'next' on 2025-03-29 at 6cf1359bf4)
673
- + refspec: replace `refspec_item_init()` with fetch/push variants
674
- + refspec: remove refspec_item_init_or_die()
675
- + refspec: replace `refspec_init()` with fetch/push variants
676
- + refspec: treat 'fetch' as a Boolean value
677
- + Merge branch 'jk/fetch-ref-prefix-cleanup' into tb/refspec-fetch-cleanup
624
+* js/comma-semicolon-confusion (2025-03-28) 10 commits
625
+ (merged to 'next' on 2025-04-07 at 3c1f7f4226)
626
+ + detect-compiler: detect clang even if it found CUDA
627
+ + clang: warn when the comma operator is used
628
+ + compat/regex: explicitly mark intentional use of the comma operator
629
+ + wildmatch: avoid using of the comma operator
630
+ + diff-delta: avoid using the comma operator
631
+ + xdiff: avoid using the comma operator unnecessarily
632
+ + clar: avoid using the comma operator unnecessarily
633
+ + kwset: avoid using the comma operator unnecessarily
634
+ + rebase: avoid using the comma operator unnecessarily
635
+ + remote-curl: avoid using the comma operator unnecessarily
636
637
Code clean-up.
638
639
Will merge to 'master'.
682
- cf. <CABPp-BE6JmiXB+pUL1Z4ewVDbG2RBxCdA2m5-WTYtoKMTtu_Xw@mail.gmail.com>
683
- source: <cover.1742338207.git.me@ttaylorr.com>
684
-
685
-
686
-* zy/send-email-error-handling (2025-03-25) 2 commits
687
- - send-email: finer-grained SMTP error handling
688
- - send-email: capture errors in an eval {} block
689
-
690
- Auth-related (and unrelated) error handling in send-email has been
691
- made more robust.
692
-
693
- Need to pick up a newer iteration.
694
- cf. <20250326075246.2612627-1-05ZYT30@gmail.com>
695
- source: <20250324145332.571813-1-05ZYT30@gmail.com>
640
+ source: <pull.1889.v3.git.1743076383.gitgitgadget@gmail.com>
641
642
698
-* aj/doc-restore-p-update (2025-03-18) 1 commit
699
- (merged to 'next' on 2025-03-24 at bdcfdc7f4e)
700
- + doc: restore: remove note on --patch w/ pathspecs
643
+* jt/ref-transaction-abort-fix (2025-03-21) 1 commit
644
+ (merged to 'next' on 2025-04-08 at b653d86941)
645
+ + builtin/fetch: avoid aborting closed reference transaction
646
702
- Stale description in "git restore -p" documentation has been
703
- updated.
647
+ A ref transaction corner case fix.
648
649
Will merge to 'master'.
706
- source: <pull.1504.v2.git.git.1685654097812.gitgitgadget@gmail.com>
650
+ cf. <Z-E2ns9VziejSLB2@pks.im>
651
+ source: <20250321004437.505461-1-jltobler@gmail.com>
652
653
709
-* ja/doc-branch-markup (2025-03-20) 2 commits
710
- (merged to 'next' on 2025-03-24 at ba6e1c7d0b)
711
- + doc: apply new format to git-branch man page
712
- + completion: take into account the formatting backticks for options
654
+* zy/send-email-error-handling (2025-04-07) 2 commits
655
+ (merged to 'next' on 2025-04-08 at d5a716a940)
656
+ + send-email: finer-grained SMTP error handling
657
+ + send-email: capture errors in an eval {} block
658
714
- Doc mark-up updates.
659
+ Auth-related (and unrelated) error handling in send-email has been
660
+ made more robust.
661
662
Will merge to 'master'.
717
- source: <pull.1880.v2.git.1742372183.gitgitgadget@gmail.com>
663
+ source: <20250326075246.2612627-1-05ZYT30@gmail.com>
664
665
666
* ps/mingw-creat-excl-fix (2025-03-21) 2 commits
721
- - compat/mingw: fix EACCESS when opening files with `O_CREAT | O_EXCL`
722
- - meson: fix compat sources when compiling with MSVC
667
+ (merged to 'next' on 2025-04-07 at 590b0d4d21)
668
+ + compat/mingw: fix EACCESS when opening files with `O_CREAT | O_EXCL`
669
+ + meson: fix compat sources when compiling with MSVC
670
671
Fix lockfile contention in reftable code on Windows.
672
726
- Will merge to 'next'.
673
+ Will merge to 'master'.
674
cf. <801fac5d-dd98-d157-6ff3-c3e8aa6a68ae@gmx.de>
675
source: <20250320-b4-pks-mingw-lockfile-flake-v2-0-a84c90cfc6c2@pks.im>
676
677
731
-* tb/combine-cruft-below-size (2025-03-21) 6 commits
732
- (merged to 'next' on 2025-03-24 at 699b83a925)
733
- + repack: begin combining cruft packs with `--combine-cruft-below-size`
734
- + repack: avoid combining cruft packs with `--max-cruft-size`
735
- + t/t7704-repack-cruft.sh: consolidate `write_blob()`
736
- + t/t7704-repack-cruft.sh: clarify wording in --max-cruft-size tests
737
- + t/t5329-pack-objects-cruft.sh: evict 'repack'-related tests
738
- + Merge branch 'tb/multi-cruft-pack-refresh-fix' into tb/combine-cruft-below-size
739
-
740
- "git repack" learned "--combine-cruft-below-size" option that
741
- controls how cruft-packs are combined.
742
-
743
- Will merge to 'master'.
744
- source: <cover.1742424671.git.me@ttaylorr.com>
745
-
746
-
747
-* jh/hash-init-fixes (2025-03-18) 1 commit
748
- (merged to 'next' on 2025-03-24 at 85b8299403)
749
- + index-pack, unpack-objects: restore missing ->init_fn
750
-
751
- An earlier code refactoring of the hash machinery missed a few
752
- required calls to init_fn.
753
-
754
- Will merge to 'master'.
755
- cf. <Z9rC0VCbh8Noaq4e@pks.im>
756
- source: <20250318111616.113941-1-hmz007@gmail.com>
757
-
758
-
678
* jk/fetch-follow-remote-head-fix (2025-03-18) 3 commits
760
- - fetch: don't ask for remote HEAD if followRemoteHEAD is "never"
761
- - fetch: only respect followRemoteHEAD with configured refspecs
762
- - Merge branch 'jk/fetch-ref-prefix-cleanup' into jk/fetch-follow-remote-head-fix
679
+ (merged to 'next' on 2025-04-07 at ba5ac342a5)
680
+ + fetch: don't ask for remote HEAD if followRemoteHEAD is "never"
681
+ + fetch: only respect followRemoteHEAD with configured refspecs
682
+ + Merge branch 'jk/fetch-ref-prefix-cleanup' into jk/fetch-follow-remote-head-fix
683
684
"git fetch [<remote>]" with only the configured fetch refspec
685
should be the only thing to update refs/remotes/<remote>/HEAD,
686
but the code was overly eager to do so in other cases.
687
768
- Will merge to 'next'.
688
+ Will merge to 'master'.
689
cf. <Z9n7myvpnDOWFWqt@nand.local>
690
source: <20250318053905.GA2051217@coredump.intra.peff.net>
691
692
773
-* pw/build-breaking-changes-doc (2025-03-18) 1 commit
774
- (merged to 'next' on 2025-03-24 at 56efeea47e)
775
- + docs: add BreakingChanges to TECH_DOCS target
776
-
777
- A documentation page was left out from formatting and installation,
778
- which has been corrected.
779
-
780
- Will merge to 'master'.
781
- source: <pull.1921.git.git.1742308900290.gitgitgadget@gmail.com>
782
-
783
-
784
-* pw/doc-pack-refs-markup-fix (2025-03-18) 1 commit
785
- (merged to 'next' on 2025-03-24 at 3bcea36a83)
786
- + pack-refs doc: fix indentation for --exclude
787
-
788
- Doc markup fix.
789
-
790
- Will merge to 'master'.
791
- source: <pull.1920.git.git.1742308828163.gitgitgadget@gmail.com>
792
-
793
-
693
* sc/bundle-uri-use-all-refs-in-bundle (2025-03-18) 2 commits
694
- bundle-uri: add test for bundle-uri clones with tags
695
- bundle-uri: copy all bundle references ino the refs/bundle space
@@ -826,117 +725,69 @@ Release tarballs are available at:
725
source: <pull.1819.v2.git.1742829769.gitgitgadget@gmail.com>
726
727
829
-* jc/name-rev-stdin (2025-03-12) 6 commits
830
- (merged to 'next' on 2025-03-24 at cfec2e409f)
831
- + name-rev: remove "--stdin" support
832
- + t6120: further modernize
833
- + t6120: avoid hiding "git" exit status
834
- + t: introduce WITH_BREAKING_CHANGES prerequisite
835
- + t: extend test_lazy_prereq
836
- + t: document test_lazy_prereq
837
-
838
- Using "git name-rev --stdin" as an example, improve the framework to
839
- prepare tests to pretend to be in the future where the breaking
840
- changes have already happened.
841
-
842
- Will merge to 'master'.
843
- source: <20250311212505.2920181-1-gitster@pobox.com>
844
-
845
-
728
* jt/rev-list-z (2025-03-21) 5 commits
847
- - rev-list: support NUL-delimited --missing option
848
- - rev-list: support NUL-delimited --boundary option
849
- - rev-list: support delimiting objects with NUL bytes
850
- - rev-list: refactor early option parsing
851
- - rev-list: inline `show_object_with_name()` in `show_object()`
729
+ (merged to 'next' on 2025-04-08 at e608ba85c1)
730
+ + rev-list: support NUL-delimited --missing option
731
+ + rev-list: support NUL-delimited --boundary option
732
+ + rev-list: support delimiting objects with NUL bytes
733
+ + rev-list: refactor early option parsing
734
+ + rev-list: inline `show_object_with_name()` in `show_object()`
735
736
"git rev-list" learns machine-parsable output format that delimits
737
each field with NUL.
738
856
- Will merge to 'next'?
739
+ Will merge to 'master'.
740
source: <20250319183410.1225428-1-jltobler@gmail.com>
741
742
743
* kn/reflog-drop (2025-03-17) 2 commits
861
- - reflog: implement subcommand to drop reflogs
862
- - reflog: improve error for when reflog is not found
744
+ (merged to 'next' on 2025-04-07 at 193c01b203)
745
+ + reflog: implement subcommand to drop reflogs
746
+ + reflog: improve error for when reflog is not found
747
748
"git reflog" learns "drop" subcommand, that discards the entire
749
reflog data for a ref.
750
867
- Will merge to 'next'.
751
+ Will merge to 'master'.
752
cf. <CAP8UFD1vTkPH=5b++6+=koozC31=wD1gQszvdFmzb73B9HM4Aw@mail.gmail.com>
753
source: <20250314-493-add-command-to-purge-reflog-entries-v3-0-c24e23a6146d@gmail.com>
754
755
872
-* cc/lop-remote (2025-03-18) 4 commits
873
- (merged to 'next' on 2025-03-24 at 3b685ceef0)
874
- + promisor-remote: compare remote names case sensitively
875
- + promisor-remote: fix possible issue when no URL is advertised
876
- + promisor-remote: fix segfault when remote URL is missing
877
- + t5710: arrange to delete the client before cloning
878
-
879
- Bugfix in newly introduced large-object-promisor remote support.
880
-
881
- Will merge to 'master'.
882
- source: <20250318110008.656695-1-christian.couder@gmail.com>
883
-
884
-
885
-* ps/ci-meson-check-build-docs (2025-03-12) 1 commit
886
- (merged to 'next' on 2025-03-29 at 5aed226a96)
887
- + ci: perform build and smoke tests for Meson docs
888
-
889
- CI update.
890
-
891
- Will merge to 'master'.
892
- source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>
893
-
894
-
756
* md/t1403-path-is-file (2025-03-04) 1 commit
896
- - t1403: verify that path exists and is a file
757
+ (merged to 'next' on 2025-04-07 at 93087893e8)
758
+ + t1403: verify that path exists and is a file
759
760
Test tweak.
761
900
- Will merge to 'next'.
762
+ Will merge to 'master'.
763
source: <20250304112728.41228-2-danimahendra0904@gmail.com>
764
765
766
* sk/clar-trailer-urlmatch-norm-test (2025-03-04) 2 commits
905
- - t/unit-tests: convert urlmatch-normalization test to clar
906
- - t/unit-tests: convert trailer test to use clar
767
+ (merged to 'next' on 2025-04-08 at 51cb3c8bce)
768
+ + t/unit-tests: convert urlmatch-normalization test to clar
769
+ + t/unit-tests: convert trailer test to use clar
770
771
A few traditional unit tests have been rewritten to use the clar
772
framework.
773
911
- Will merge to 'next'?
774
+ Will merge to 'master'.
775
cf. <xmqqzfi0pthr.fsf@gitster.g>
776
+ cf. <Z_TAtJ9LEeHo2AQN@pks.im>
777
source: <20250304113323.10564-1-kuforiji98@gmail.com>
778
779
916
-* dm/completion-remote-names-fix (2025-03-23) 2 commits
917
- (merged to 'next' on 2025-03-26 at b9460e20ae)
918
- + completion: fix bugs with slashes in remote names
919
- + completion: add helper to count path components
920
-
921
- The bash command line completion script (in contrib/) has been
922
- updated to cope with remote repository nicknames with slashes in
923
- them.
924
-
925
- Will merge to 'master'.
926
- source: <17274df2746d304db876ebd82ad8d932@mandelberg.org>
927
-
928
-
929
-* kn/non-transactional-batch-updates (2025-03-29) 10 commits
930
- - SQUASH??? - <6141866.lOV4Wx5bFT@cayenne>
931
- - update-ref: add --batch-updates flag for stdin mode
932
- - refs: support rejection in batch updates during F/D checks
933
- - refs: implement batch reference update support
934
- - refs: introduce enum-based transaction error types
935
- - refs/reftable: extract code from the transaction preparation
936
- - refs/files: remove duplicate duplicates check
937
- - refs: move duplicate refname update check to generic layer
938
- - refs/files: remove redundant check in split_symref_update()
939
- - Merge branch 'ps/refname-avail-check-optim' into kn/non-transactional-batch-updates
780
+* kn/non-transactional-batch-updates (2025-04-08) 9 commits
781
+ (merged to 'next' on 2025-04-08 at de64e9c49e)
782
+ + update-ref: add --batch-updates flag for stdin mode
783
+ + refs: support rejection in batch updates during F/D checks
784
+ + refs: implement batch reference update support
785
+ + refs: introduce enum-based transaction error types
786
+ + refs/reftable: extract code from the transaction preparation
787
+ + refs/files: remove duplicate duplicates check
788
+ + refs: move duplicate refname update check to generic layer
789
+ + refs/files: remove redundant check in split_symref_update()
790
+ + Merge branch 'ps/refname-avail-check-optim' into kn/non-transactional-batch-updates
791
792
Updating multiple references have only been possible in all-or-none
793
fashion with transactions, but it can be more efficient to batch
@@ -944,64 +795,64 @@ Release tarballs are available at:
795
best-effort manner. A new "best effort batches of updates" mode
796
has been introduced.
797
947
- Expecting a (small and hopefully final) reroll.
948
- cf. <CAOLa=ZQDiCx_VJRbQB1K6EeuA2mDj4twEB98ByddUNLtB8rEKQ@mail.gmail.com>
949
- source: <20250327-245-partially-atomic-ref-updates-v5-0-4db2a3e34404@gmail.com>
798
+ Will merge to 'master'.
799
+ source: <20250408085120.614893-1-karthik.188@gmail.com>
800
801
802
* ps/object-wo-the-repository (2025-03-10) 12 commits
953
- - hash: stop depending on `the_repository` in `null_oid()`
954
- - hash: fix "-Wsign-compare" warnings
955
- - object-file: split out logic regarding hash algorithms
956
- - delta-islands: stop depending on `the_repository`
957
- - object-file-convert: stop depending on `the_repository`
958
- - pack-bitmap-write: stop depending on `the_repository`
959
- - pack-revindex: stop depending on `the_repository`
960
- - pack-check: stop depending on `the_repository`
961
- - environment: move access to "core.bigFileThreshold" into repo settings
962
- - pack-write: stop depending on `the_repository` and `the_hash_algo`
963
- - object: stop depending on `the_repository`
964
- - csum-file: stop depending on `the_repository`
803
+ (merged to 'next' on 2025-04-07 at 0cc0c8631d)
804
+ + hash: stop depending on `the_repository` in `null_oid()`
805
+ + hash: fix "-Wsign-compare" warnings
806
+ + object-file: split out logic regarding hash algorithms
807
+ + delta-islands: stop depending on `the_repository`
808
+ + object-file-convert: stop depending on `the_repository`
809
+ + pack-bitmap-write: stop depending on `the_repository`
810
+ + pack-revindex: stop depending on `the_repository`
811
+ + pack-check: stop depending on `the_repository`
812
+ + environment: move access to "core.bigFileThreshold" into repo settings
813
+ + pack-write: stop depending on `the_repository` and `the_hash_algo`
814
+ + object: stop depending on `the_repository`
815
+ + csum-file: stop depending on `the_repository`
816
817
The object layer has been updated to take an explicit repository
818
instance as a parameter in more code paths.
819
969
- Will merge to 'next'.
820
+ Will merge to 'master'.
821
cf. <CABPp-BFrjqf=dMNwxzyMj3EQrAXTYkH7rDTi7X7xoWnoW_A4eA@mail.gmail.com>
822
source: <20250310-b4-pks-objects-without-the-repository-v4-0-f201b8ec57ba@pks.im>
823
824
974
-* ps/maintenance-reflog-expire (2025-02-26) 6 commits
975
- - builtin/maintenance: introduce "reflog-expire" task
976
- - builtin/gc: split out function to expire reflog entries
977
- - builtin/reflog: make functions regarding `reflog_expire_options` public
978
- - builtin/reflog: stop storing per-reflog expiry dates globally
979
- - builtin/reflog: stop storing default reflog expiry dates globally
980
- - reflog: rename `cmd_reflog_expire_cb` to `reflog_expire_options`
825
+* ps/maintenance-reflog-expire (2025-04-08) 6 commits
826
+ (merged to 'next' on 2025-04-08 at 40d6884143)
827
+ + builtin/maintenance: introduce "reflog-expire" task
828
+ + builtin/gc: split out function to expire reflog entries
829
+ + builtin/reflog: make functions regarding `reflog_expire_options` public
830
+ + builtin/reflog: stop storing per-reflog expiry dates globally
831
+ + builtin/reflog: stop storing default reflog expiry dates globally
832
+ + reflog: rename `cmd_reflog_expire_cb` to `reflog_expire_options`
833
834
"git maintenance" learns a new task to expire reflog entries.
835
984
- Expecting a (small and hopefully final) reroll.
985
- cf. <ammsrvhyzo6f7hfcizlh42e3e5cznfb2j37tcicliqqpqaaqgs@4mniagc5ejzz>
986
- cf. <usf4pzrp322xvfrvsasgy22rnw7d2a6krzuctwpp23ppdgh6ji@ram73wv5dn54>
987
- source: <20250226-pks-maintenance-reflog-expire-v1-0-a1204a814952@pks.im>
836
+ Will merge to 'master'.
837
+ source: <20250408-pks-maintenance-reflog-expire-v2-0-1ad8634798b7@pks.im>
838
839
840
* jk/zlib-inflate-fixes (2025-02-25) 10 commits
991
- - unpack_loose_rest(): rewrite return handling for clarity
992
- - unpack_loose_rest(): simplify error handling
993
- - unpack_loose_rest(): never clean up zstream
994
- - unpack_loose_rest(): avoid numeric comparison of zlib status
995
- - unpack_loose_header(): avoid numeric comparison of zlib status
996
- - git_inflate(): skip zlib_post_call() sanity check on Z_NEED_DICT
997
- - unpack_loose_header(): fix infinite loop on broken zlib input
998
- - unpack_loose_header(): report headers without NUL as "bad"
999
- - unpack_loose_header(): simplify next_out assignment
1000
- - loose_object_info(): BUG() on inflating content with unknown type
841
+ (merged to 'next' on 2025-04-07 at 4343a155f7)
842
+ + unpack_loose_rest(): rewrite return handling for clarity
843
+ + unpack_loose_rest(): simplify error handling
844
+ + unpack_loose_rest(): never clean up zstream
845
+ + unpack_loose_rest(): avoid numeric comparison of zlib status
846
+ + unpack_loose_header(): avoid numeric comparison of zlib status
847
+ + git_inflate(): skip zlib_post_call() sanity check on Z_NEED_DICT
848
+ + unpack_loose_header(): fix infinite loop on broken zlib input
849
+ + unpack_loose_header(): report headers without NUL as "bad"
850
+ + unpack_loose_header(): simplify next_out assignment
851
+ + loose_object_info(): BUG() on inflating content with unknown type
852
853
Fix our use of zlib corner cases.
854
1004
- Will merge to 'next'.
855
+ Will merge to 'master'.
856
source: <20250225062518.GA1293854@coredump.intra.peff.net>
857
858
@@ -1025,69 +876,14 @@ Release tarballs are available at:
876
877
878
* ps/reftable-windows-unlink-fix (2025-02-18) 2 commits
1028
- - reftable: ignore file-in-use errors when unlink(3p) fails on Windows
1029
- - Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-windows-unlink-fix
1030
- (this branch uses ps/reftable-sans-compat-util.)
879
+ (merged to 'next' on 2025-04-07 at 88e2a9a077)
880
+ + reftable: ignore file-in-use errors when unlink(3p) fails on Windows
881
+ + Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-windows-unlink-fix
882
883
Portability fix.
884
1034
- Will merge to 'next'.
1035
- source: <20250206-b4-pks-reftable-win32-in-use-errors-v2-1-56985a4f6186@pks.im>
1036
-
1037
-
1038
-* ps/reftable-sans-compat-util (2025-02-18) 18 commits
1039
- (merged to 'next' on 2025-03-29 at 4e9fbae111)
1040
- + Makefile: skip reftable library for Coccinelle
1041
- + reftable: decouple from Git codebase by pulling in "compat/posix.h"
1042
- + git-compat-util.h: split out POSIX-emulating bits
1043
- + compat/mingw: split out POSIX-related bits
1044
- + reftable/basics: introduce `REFTABLE_UNUSED` annotation
1045
- + reftable/basics: stop using `SWAP()` macro
1046
- + reftable/stack: stop using `sleep_millisec()`
1047
- + reftable/system: introduce `reftable_rand()`
1048
- + reftable/reader: stop using `ARRAY_SIZE()` macro
1049
- + reftable/basics: provide wrappers for big endian conversion
1050
- + reftable/basics: stop using `st_mult()` in array allocators
1051
- + reftable: stop using `BUG()` in trivial cases
1052
- + reftable/record: don't `BUG()` in `reftable_record_cmp()`
1053
- + reftable/record: stop using `BUG()` in `reftable_record_init()`
1054
- + reftable/record: stop using `COPY_ARRAY()`
1055
- + reftable/blocksource: stop using `xmmap()`
1056
- + reftable/stack: stop using `write_in_full()`
1057
- + reftable/stack: stop using `read_in_full()`
1058
- (this branch is used by ps/reftable-api-revamp and ps/reftable-windows-unlink-fix.)
1059
-
1060
- Make the code in reftable library less reliant on the service
1061
- routines it used to borrow from Git proper, to make it easier to
1062
- use by external users of the library.
1063
-
1064
- Will merge to 'master'.
1065
- cf. <Z-Y1YbE2EVqLZhGO@pks.im>
1066
- source: <20250218-pks-reftable-drop-git-compat-util-v6-0-8c1f39fb4c02@pks.im>
1067
-
1068
-
1069
-* tb/incremental-midx-part-2 (2025-03-21) 14 commits
1070
- (merged to 'next' on 2025-03-29 at 1db17d1a9b)
1071
- + midx: implement writing incremental MIDX bitmaps
1072
- + pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators
1073
- + pack-bitmap.c: keep track of each layer's type bitmaps
1074
- + ewah: implement `struct ewah_or_iterator`
1075
- + pack-bitmap.c: apply pseudo-merge commits with incremental MIDXs
1076
- + pack-bitmap.c: compute disk-usage with incremental MIDXs
1077
- + pack-bitmap.c: teach `rev-list --test-bitmap` about incremental MIDXs
1078
- + pack-bitmap.c: support bitmap pack-reuse with incremental MIDXs
1079
- + pack-bitmap.c: teach `show_objects_for_type()` about incremental MIDXs
1080
- + pack-bitmap.c: teach `bitmap_for_commit()` about incremental MIDXs
1081
- + pack-bitmap.c: open and store incremental bitmap layers
1082
- + pack-revindex: prepare for incremental MIDX bitmaps
1083
- + Documentation: describe incremental MIDX bitmaps
1084
- + Documentation: remove a "future work" item from the MIDX docs
1085
- (this branch is used by ps/cat-file-filter-batch.)
1086
-
1087
- Incrementally updating multi-pack index files.
1088
-
885
Will merge to 'master'.
1090
- source: <cover.1742493373.git.me@ttaylorr.com>
886
+ source: <20250206-b4-pks-reftable-win32-in-use-errors-v2-1-56985a4f6186@pks.im>
887
888
889
* ej/cat-file-remote-object-info (2025-02-24) 8 commits
@@ -1148,17 +944,13 @@ Release tarballs are available at:
944
source: <3d127f293818f935efdb9ca7bb556e6a8f233ef7.1741975557.git.sam@gentoo.org>
945
946
1151
---------------------------------------------------
1152
-[Discarded]
1153
-
947
* jc/doc-attr-tree (2024-12-14) 1 commit
1155
- - doc: give attr.tree a bit more visibility
948
+ . doc: give attr.tree a bit more visibility
949
950
Make sure that "git --attr-source=X", GIT_ATTR_SOURCE, and
951
attr.tree configuration variables appear at the same places in the
952
documentation.
953
1161
- Will discard.
954
+ Discarded.
955
cf. <20241216111112.GA2201417@coredump.intra.peff.net>
956
source: <xmqq5xnladwi.fsf@gitster.g>
1164
-