What's cooking (2024/05 #09)
Junio C Hamano committed
May 23, 2024 at 12:08 UTC
ee452b1a880767369186e6e397a867d1afda27f9
1 file changed
+250
-222
whats-cooking.txt
+250
-222
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2024, #08; Mon, 20)
3
-X-master-at: 4365c6fcf96caac73dcc412aa25db34cf8df48d5
4
-X-next-at: 888b28324335471fe2b21105063128ca8fa54801
2
+Subject: What's cooking in git.git (May 2024, #09; Thu, 23)
3
+X-master-at: b9cfe4845cb2562584837bc0101c0ab76490a239
4
+X-next-at: bbe1065a7e6f9ab964c30003b9eadf3a65c611d5
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2024, #08; Mon, 20)
7
+What's cooking in git.git (May 2024, #09; Thu, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,15 @@ 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
+We unfortunately had serious regressions in 2.45.1 (and below, down
21
+to 2.39 maintenance track are affected), and we are trying to assess
22
+the extent of damage and which changes that went into the release to
23
+revert. We know about "git lfs" and "git annex" getting affected.
24
+If your workflow is affected, you would want to try out 'seen' that
25
+has proposed reverts to alleviate and report back to us, to make sure
26
+that the next set of maintenance releases will fix the regressions
27
+for you.
28
+
29
Copies of the source code to Git live in many repositories, and the
30
following is a list of the ones I push into or their mirrors. Some
31
repositories have only a subset of branches.
@@ -46,52 +55,171 @@ Release tarballs are available at:
55
https://www.kernel.org/pub/software/scm/git/
56
57
--------------------------------------------------
49
-[New Topics]
58
+[Graduated to 'master']
59
51
-* es/chainlint-ncores-fix (2024-05-20) 3 commits
52
- - chainlint.pl: latch CPU count directly reported by /proc/cpuinfo
53
- - chainlint.pl: fix incorrect CPU count on Linux SPARC
54
- - chainlint.pl: make CPU count computation more robust
60
+* dg/fetch-pack-code-cleanup (2024-05-13) 1 commit
61
+ (merged to 'next' on 2024-05-17 at c8f8136d2e)
62
+ + fetch-pack: remove unused 'struct loose_object_iter'
63
56
- The chainlint script (invoked during "make test") did nothing when
57
- it failed to detect the number of available CPUs. It now falls
58
- back to 1 CPU to avoid the problem.
64
+ Code clean-up to remove an unused struct definition.
65
+ source: <20240512005913.342287-1-dave@treblig.org>
66
+
67
+
68
+* dm/update-index-doc-fix (2024-05-13) 1 commit
69
+ (merged to 'next' on 2024-05-17 at 2f6cd0d1cc)
70
+ + documentation: git-update-index: add --show-index-version to synopsis
71
+
72
+ Doc fix.
73
+ source: <20240512031400.28416-1-dov.murik@linux.dev>
74
+
75
+
76
+* it/refs-name-conflict (2024-05-06) 1 commit
77
+ (merged to 'next' on 2024-05-15 at 39ef3ecc88)
78
+ + refs: return conflict error when checking packed refs
79
+
80
+ Expose "name conflict" error when a ref creation fails due to D/F
81
+ conflict in the ref namespace, to improve an error message given by
82
+ "git fetch".
83
+ source: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com>
84
60
- Will merge to 'next'.
61
- source: <20240520190131.94904-1-ericsunshine@charter.net>
85
+
86
+* jc/patch-flow-updates (2024-05-10) 2 commits
87
+ (merged to 'next' on 2024-05-16 at d7a885574b)
88
+ + SubmittingPatches: extend the "flow" section
89
+ + SubmittingPatches: move the patch-flow section earlier
90
+ (this branch is used by kn/patch-iteration-doc.)
91
+
92
+ Doc updates.
93
+ source: <20240510165526.1412338-1-gitster@pobox.com>
94
+
95
+
96
+* la/hide-trailer-info (2024-05-02) 11 commits
97
+ (merged to 'next' on 2024-05-15 at 955ffe4f37)
98
+ + trailer unit tests: inspect iterator contents
99
+ + trailer: document parse_trailers() usage
100
+ + trailer: retire trailer_info_get() from API
101
+ + trailer: make trailer_info struct private
102
+ + trailer: make parse_trailers() return trailer_info pointer
103
+ + interpret-trailers: access trailer_info with new helpers
104
+ + sequencer: use the trailer iterator
105
+ + trailer: teach iterator about non-trailer lines
106
+ + trailer: add unit tests for trailer iterator
107
+ + Makefile: sort UNIT_TEST_PROGRAMS
108
+ + Merge branch 'la/format-trailer-info' into la/hide-trailer-info
109
+
110
+ The trailer API has been reshuffled a bit.
111
+ source: <pull.1696.v4.git.1714625667.gitgitgadget@gmail.com>
112
+
113
+
114
+* mt/openindiana-portability (2024-05-17) 7 commits
115
+ (merged to 'next' on 2024-05-17 at de53f37879)
116
+ + t/t9001-send-email.sh: sed - remove the i flag for s
117
+ + t/t9118-git-svn-funky-branch-names.sh: sed needs semicolon
118
+ + t/t1700-split-index.sh: mv -v is not portable
119
+ + t/t4202-log.sh: fix misspelled variable
120
+ + t/t0600-reffiles-backend.sh: rm -v is not portable
121
+ + t/t9902-completion.sh: backslashes in echo
122
+ + Switch grep from non-portable BRE to portable ERE
123
+
124
+ Portability updates to various uses of grep and sed.
125
+ source: <ZkeMiifGHkIsehz3@telcontar>
126
127
--------------------------------------------------
64
-[Graduated to 'master']
128
+[New Topics]
129
66
-* jc/compat-regex-calloc-fix (2024-05-13) 1 commit
67
- (merged to 'next' on 2024-05-13 at 077c4e1dcc)
68
- + compat/regex: fix argument order to calloc(3)
130
+* gt/unit-test-strcmp-offset (2024-05-20) 1 commit
131
+ (merged to 'next' on 2024-05-23 at f672ec425f)
132
+ + t/: port helper/test-strcmp-offset.c to unit-tests/t-strcmp-offset.c
133
70
- Windows CI running in GitHub Actions started complaining about the
71
- order of arguments given to calloc(); the imported regex code uses
72
- the wrong order almost consistently, which has been corrected.
73
- source: <xmqqbk5bim2n.fsf@gitster.g>
134
+ The strcmp-offset tests have been rewritten using the unit test
135
+ framework.
136
137
+ Will merge to 'master'.
138
+ source: <20240519204530.12258-3-shyamthakkar001@gmail.com>
139
76
-* kn/ref-transaction-symref (2024-05-07) 8 commits
77
- (merged to 'next' on 2024-05-11 at 0a7119f2a3)
78
- + refs: remove `create_symref` and associated dead code
79
- + refs: rename `refs_create_symref()` to `refs_update_symref()`
80
- + refs: use transaction in `refs_create_symref()`
81
- + refs: add support for transactional symref updates
82
- + refs: move `original_update_refname` to 'refs.c'
83
- + refs: support symrefs in 'reference-transaction' hook
84
- + files-backend: extract out `create_symref_lock()`
85
- + refs: accept symref values in `ref_transaction_update()`
86
- (this branch is used by kn/update-ref-symref.)
140
88
- Updates to symbolic refs can now be made as a part of ref
89
- transaction.
90
- source: <20240507125859.132116-1-knayak@gitlab.com>
141
+* jc/add-patch-enforce-single-letter-input (2024-05-22) 1 commit
142
+ (merged to 'next' on 2024-05-23 at 12fef48392)
143
+ + add-patch: enforce only one-letter response to prompts
144
+
145
+ "git add -p" learned to complain when an answer with more than one
146
+ letter is given to a prompt that expects a single letter answer.
147
+
148
+ Will merge to 'master'.
149
+ source: <xmqqh6ep1pwz.fsf_-_@gitster.g>
150
+
151
+
152
+* jc/fix-2.45.1-and-friends-for-2.39 (2024-05-22) 12 commits
153
+ - Revert "fsck: warn about symlink pointing inside a gitdir"
154
+ - Revert "Add a helper function to compare file contents"
155
+ - clone: drop the protections where hooks aren't run
156
+ - tests: verify that `clone -c core.hooksPath=/dev/null` works again
157
+ - Revert "core.hooksPath: add some protection while cloning"
158
+ - init: use the correct path of the templates directory again
159
+ - hook: plug a new memory leak
160
+ - ci: stop installing "gcc-13" for osx-gcc
161
+ - ci: avoid bare "gcc" for osx-gcc job
162
+ - ci: drop mention of BREW_INSTALL_PACKAGES variable
163
+ - send-email: avoid creating more than one Term::ReadLine object
164
+ - send-email: drop FakeTerm hack
165
+ (this branch is used by jc/fix-2.45.1-and-friends-for-maint.)
166
+
167
+ Revert overly aggressive "layered defence" that went into 2.45.1
168
+ and friends, which broke "git-lfs", "git-annex", and other use
169
+ cases, so that we can rebuild necessary counterparts in the open.
170
+
171
+ Needs consensus on what (more) to revert or adjust.
172
+ source: <20240521195659.870714-1-gitster@pobox.com>
173
+
174
+
175
+* jc/fix-2.45.1-and-friends-for-maint (2024-05-22) 12 commits
176
+ - Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint
177
+ - Merge branch 'fixes/2.45.1/2.43' into fixes/2.45.1/2.44
178
+ - Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43
179
+ - Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42
180
+ - Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41
181
+ - Merge branch 'jc/fix-2.45.1-and-friends-for-2.39' into fixes/2.45.1/2.40
182
+ - Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint
183
+ - Merge branch 'fixes/2.45.1/2.43' into fixes/2.45.1/2.44
184
+ - Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43
185
+ - Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42
186
+ - Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41
187
+ - Merge branch 'jc/fix-2.45.1-and-friends-for-2.39' into fixes/2.45.1/2.40
188
+ (this branch uses jc/fix-2.45.1-and-friends-for-2.39.)
189
+
190
+ Adjust jc/fix-2.45.1-and-friends-for-2.39 for more recent
191
+ maintenance track.
192
+
193
+ Will be merged to 'next' when the base topic becomes ready.
194
+
195
+
196
+* ps/fix-reinit-includeif-onbranch (2024-05-22) 1 commit
197
+ - setup: fix bug with "includeIf.onbranch" when initializing dir
198
+
199
+ "git init" in an already created directory, when the user
200
+ configuration has includeif.onbranch, started to fail recently,
201
+ which has been corrected.
202
+
203
+ Will merge to 'next'.
204
+ source: <cf182bb9ee7d4a7eb46e5dbf4f3ef5deb198d823.1716374321.git.ps@pks.im>
205
206
--------------------------------------------------
207
[Cooking]
208
209
+* es/chainlint-ncores-fix (2024-05-22) 3 commits
210
+ (merged to 'next' on 2024-05-22 at 1e4ab85522)
211
+ + chainlint.pl: latch CPU count directly reported by /proc/cpuinfo
212
+ + chainlint.pl: fix incorrect CPU count on Linux SPARC
213
+ + chainlint.pl: make CPU count computation more robust
214
+
215
+ The chainlint script (invoked during "make test") did nothing when
216
+ it failed to detect the number of available CPUs. It now falls
217
+ back to 1 CPU to avoid the problem.
218
+
219
+ Will merge to 'master'.
220
+ source: <20240520190131.94904-1-ericsunshine@charter.net>
221
+
222
+
223
* tb/pack-bitmap-write-cleanups (2024-05-15) 6 commits
224
(merged to 'next' on 2024-05-20 at 585e7bde21)
225
+ pack-bitmap: introduce `bitmap_writer_free()`
@@ -118,18 +246,19 @@ Release tarballs are available at:
246
247
248
* kn/osxkeychain-skip-idempotent-store (2024-05-15) 2 commits
121
- - osxkeychain: state to skip unnecessary store operations
122
- - osxkeychain: exclusive lock to serialize execution of operations
249
+ (merged to 'next' on 2024-05-21 at 4d757167ad)
250
+ + osxkeychain: state to skip unnecessary store operations
251
+ + osxkeychain: exclusive lock to serialize execution of operations
252
253
The credential helper that talks with osx keychain learned to avoid
254
storing back the authentication material it just got received from
255
the keychain.
256
128
- Comments?
257
+ Will merge to 'master'.
258
source: <pull.1729.v3.git.1715800868.gitgitgadget@gmail.com>
259
260
132
-* kn/update-ref-symref (2024-05-15) 7 commits
261
+* kn/update-ref-symref (2024-05-23) 7 commits
262
- update-ref: add support for 'symref-update' command
263
- reftable: pick either 'oid' or 'target' for new updates
264
- update-ref: add support for 'symref-create' command
@@ -141,8 +270,7 @@ Release tarballs are available at:
270
"git update-ref --stdin" learned to handle transactional updates of
271
symbolic-refs.
272
144
- Expecting a reroll.
145
- cf. <ZkXpcvF6dxGr6qmj@tanuki>
273
+ Needs review.
274
source: <20240514124411.1037019-1-knayak@gitlab.com>
275
276
@@ -169,29 +297,31 @@ Release tarballs are available at:
297
298
299
* ps/refs-without-the-repository-updates (2024-05-17) 17 commits
172
- - refs/packed: remove references to `the_hash_algo`
173
- - refs/files: remove references to `the_hash_algo`
174
- - refs/files: use correct repository
175
- - refs: remove `dwim_log()`
176
- - refs: drop `git_default_branch_name()`
177
- - refs: pass repo when peeling objects
178
- - refs: move object peeling into "object.c"
179
- - refs: pass ref store when detecting dangling symrefs
180
- - refs: convert iteration over replace refs to accept ref store
181
- - refs: retrieve worktree ref stores via associated repository
182
- - refs: refactor `resolve_gitlink_ref()` to accept a repository
183
- - refs: pass repo when retrieving submodule ref store
184
- - refs: track ref stores via strmap
185
- - refs: implement releasing ref storages
186
- - refs: rename `init_db` callback to avoid confusion
187
- - refs: adjust names for `init` and `init_db` callbacks
188
- - Merge branch 'ps/refs-without-the-repository' into ps/refs-without-the-repository-updates
300
+ (merged to 'next' on 2024-05-22 at 744f37ab2b)
301
+ + refs/packed: remove references to `the_hash_algo`
302
+ + refs/files: remove references to `the_hash_algo`
303
+ + refs/files: use correct repository
304
+ + refs: remove `dwim_log()`
305
+ + refs: drop `git_default_branch_name()`
306
+ + refs: pass repo when peeling objects
307
+ + refs: move object peeling into "object.c"
308
+ + refs: pass ref store when detecting dangling symrefs
309
+ + refs: convert iteration over replace refs to accept ref store
310
+ + refs: retrieve worktree ref stores via associated repository
311
+ + refs: refactor `resolve_gitlink_ref()` to accept a repository
312
+ + refs: pass repo when retrieving submodule ref store
313
+ + refs: track ref stores via strmap
314
+ + refs: implement releasing ref storages
315
+ + refs: rename `init_db` callback to avoid confusion
316
+ + refs: adjust names for `init` and `init_db` callbacks
317
+ + Merge branch 'ps/refs-without-the-repository' into ps/refs-without-the-repository-updates
318
+ (this branch is used by ps/ref-storage-migration.)
319
320
Further clean-up the refs subsystem to stop relying on
321
the_repository, and instead use the repository associated to the
322
ref_store object.
323
194
- Will merge to 'next'?
324
+ Will merge to 'master'.
325
source: <cover.1715929858.git.ps@pks.im>
326
327
@@ -210,7 +340,6 @@ Release tarballs are available at:
340
(merged to 'next' on 2024-05-20 at e0ee0051a9)
341
+ SubmittingPatches: add section for iterating patches
342
+ Merge branch 'jc/patch-flow-updates' into kn/patch-iteration-doc
213
- (this branch uses jc/patch-flow-updates.)
343
344
Doc updates.
345
@@ -218,22 +347,6 @@ Release tarballs are available at:
347
source: <20240517122724.270706-1-knayak@gitlab.com>
348
349
221
-* mt/openindiana-portability (2024-05-17) 7 commits
222
- (merged to 'next' on 2024-05-17 at de53f37879)
223
- + t/t9001-send-email.sh: sed - remove the i flag for s
224
- + t/t9118-git-svn-funky-branch-names.sh: sed needs semicolon
225
- + t/t1700-split-index.sh: mv -v is not portable
226
- + t/t4202-log.sh: fix misspelled variable
227
- + t/t0600-reffiles-backend.sh: rm -v is not portable
228
- + t/t9902-completion.sh: backslashes in echo
229
- + Switch grep from non-portable BRE to portable ERE
230
-
231
- Portability updates to various uses of grep and sed.
232
-
233
- Will merge to 'master'.
234
- source: <ZkeMiifGHkIsehz3@telcontar>
235
-
236
-
350
* mt/openindiana-scalar (2024-05-17) 1 commit
351
- scalar: make enlistment delete to work on all POSIX platforms
352
@@ -246,23 +359,33 @@ Release tarballs are available at:
359
* ts/archive-prefix-with-add-virtual-file (2024-05-17) 1 commit
360
- archive: make --add-virtual-file honor --prefix
361
362
+ The "--add-virtual-file" option of "git archive", added primarily
363
+ to help "git diagnose", has always ignored the "--prefix", but
364
+ been documented to honor it.
365
+
366
+ Iffy if updating the implementation is the best approach.
367
+ cf. <bc3711a7-37d5-46bc-979e-83bd0b2cf900@web.de>
368
source: <pull.1719.v2.git.git.1715967267420.gitgitgadget@gmail.com>
369
370
371
* js/doc-decisions (2024-05-17) 1 commit
253
- - doc: describe the project's decision-making process
372
+ (merged to 'next' on 2024-05-22 at 891a062720)
373
+ + doc: describe the project's decision-making process
374
375
The project decision making policy has been documented.
376
+
377
+ Will merge to 'master'.
378
source: <10f217915600eda3ebec886e4f020f87c22e318a.1715978031.git.steadmon@google.com>
379
380
259
-* jc/undecided-is-not-necessarily-sha1-fix (2024-05-16) 6 commits
260
- - apply: fix uninitialized hash function
261
- - builtin/hash-object: fix uninitialized hash function
262
- - builtin/patch-id: fix uninitialized hash function
263
- - t1517: test commands that are designed to be run outside repository
264
- - setup: add an escape hatch for "no more default hash algorithm" change
265
- - Merge branch 'ps/undecided-is-not-necessarily-sha1' into jc/undecided-is-not-necessarily-sha1-fix
381
+* jc/undecided-is-not-necessarily-sha1-fix (2024-05-21) 6 commits
382
+ (merged to 'next' on 2024-05-22 at 4bd7982ebe)
383
+ + apply: fix uninitialized hash function
384
+ + builtin/hash-object: fix uninitialized hash function
385
+ + builtin/patch-id: fix uninitialized hash function
386
+ + t1517: test commands that are designed to be run outside repository
387
+ + setup: add an escape hatch for "no more default hash algorithm" change
388
+ + Merge branch 'ps/undecided-is-not-necessarily-sha1' into jc/undecided-is-not-necessarily-sha1-fix
389
(this branch uses ps/undecided-is-not-necessarily-sha1.)
390
391
The base topic started to make it an error for a command to leave
@@ -271,29 +394,8 @@ Release tarballs are available at:
394
the "default is sha-1" behaviour as an escape hatch, and start
395
fixing these breakages.
396
274
- Broken.
275
- The hash-object test does not seem to work with SHA-256 repositories.
276
- source: <20240513224127.2042052-1-gitster@pobox.com>
277
-
278
-
279
-* dg/fetch-pack-code-cleanup (2024-05-13) 1 commit
280
- (merged to 'next' on 2024-05-17 at c8f8136d2e)
281
- + fetch-pack: remove unused 'struct loose_object_iter'
282
-
283
- Code clean-up to remove an unused struct definition.
284
-
285
- Will merge to 'master'.
286
- source: <20240512005913.342287-1-dave@treblig.org>
287
-
288
-
289
-* dm/update-index-doc-fix (2024-05-13) 1 commit
290
- (merged to 'next' on 2024-05-17 at 2f6cd0d1cc)
291
- + documentation: git-update-index: add --show-index-version to synopsis
292
-
293
- Doc fix.
294
-
397
Will merge to 'master'.
296
- source: <20240512031400.28416-1-dov.murik@linux.dev>
398
+ source: <20240520231434.1816979-1-gitster@pobox.com>
399
400
401
* ps/builtin-config-cleanup (2024-05-15) 22 commits
@@ -340,89 +442,69 @@ Release tarballs are available at:
442
443
444
* ps/reftable-reusable-iterator (2024-05-13) 13 commits
343
- - reftable/merged: adapt interface to allow reuse of iterators
344
- - reftable/stack: provide convenience functions to create iterators
345
- - reftable/reader: adapt interface to allow reuse of iterators
346
- - reftable/generic: adapt interface to allow reuse of iterators
347
- - reftable/generic: move seeking of records into the iterator
348
- - reftable/merged: simplify indices for subiterators
349
- - reftable/merged: split up initialization and seeking of records
350
- - reftable/reader: set up the reader when initializing table iterator
351
- - reftable/reader: inline `reader_seek_internal()`
352
- - reftable/reader: separate concerns of table iter and reftable reader
353
- - reftable/reader: unify indexed and linear seeking
354
- - reftable/reader: avoid copying index iterator
355
- - reftable/block: use `size_t` to track restart point index
445
+ (merged to 'next' on 2024-05-22 at b92eb9939f)
446
+ + reftable/merged: adapt interface to allow reuse of iterators
447
+ + reftable/stack: provide convenience functions to create iterators
448
+ + reftable/reader: adapt interface to allow reuse of iterators
449
+ + reftable/generic: adapt interface to allow reuse of iterators
450
+ + reftable/generic: move seeking of records into the iterator
451
+ + reftable/merged: simplify indices for subiterators
452
+ + reftable/merged: split up initialization and seeking of records
453
+ + reftable/reader: set up the reader when initializing table iterator
454
+ + reftable/reader: inline `reader_seek_internal()`
455
+ + reftable/reader: separate concerns of table iter and reftable reader
456
+ + reftable/reader: unify indexed and linear seeking
457
+ + reftable/reader: avoid copying index iterator
458
+ + reftable/block: use `size_t` to track restart point index
459
460
Code clean-up to make the reftable iterator closer to be reusable.
461
359
- Comments?
462
+ Will merge to 'master'.
463
source: <cover.1715589670.git.ps@pks.im>
464
465
363
-* tb/precompose-getcwd (2024-05-09) 1 commit
364
- (merged to 'next' on 2024-05-11 at d1b507b01a)
365
- + macOS: ls-files path fails if path of workdir is NFD
466
+* tb/precompose-getcwd (2024-05-21) 1 commit
467
+ - macOS: ls-files path fails if path of workdir is NFD
468
469
We forgot to normalize the result of getcwd() to NFC on macOS where
470
all other paths are normalized, which has been corrected.
471
370
- On hold.
472
+ Reverted out of 'next' to be replaced with an updated version (this one).
473
+ Expectign a reroll to clarify the proposed log message.
474
cf. <20240520160601.GA29154@tb-raspi4>
372
- source: <20240509161110.12121-1-tboegi@web.de>
373
-
374
-
375
-* jc/patch-flow-updates (2024-05-10) 2 commits
376
- (merged to 'next' on 2024-05-16 at d7a885574b)
377
- + SubmittingPatches: extend the "flow" section
378
- + SubmittingPatches: move the patch-flow section earlier
379
- (this branch is used by kn/patch-iteration-doc.)
380
-
381
- Doc updates.
382
-
383
- Will merge to 'master'.
384
- source: <20240510165526.1412338-1-gitster@pobox.com>
385
-
386
-
387
-* it/refs-name-conflict (2024-05-06) 1 commit
388
- (merged to 'next' on 2024-05-15 at 39ef3ecc88)
389
- + refs: return conflict error when checking packed refs
390
-
391
- Expose "name conflict" error when a ref creation fails due to D/F
392
- conflict in the ref namespace, to improve an error message given by
393
- "git fetch".
394
-
395
- Will merge to 'master'.
396
- source: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com>
475
+ cf. <20240521205749.GA8165@tb-raspi4>
476
+ source: <20240521141452.26210-1-tboegi@web.de>
477
478
479
* jc/format-patch-more-aggressive-range-diff (2024-05-06) 1 commit
400
- - format-patch: run range-diff with larger creation-factor
480
+ (merged to 'next' on 2024-05-21 at 899cce93fb)
481
+ + format-patch: run range-diff with larger creation-factor
482
483
The default "creation-factor" used by "git format-patch" has been
484
raised to make it more aggressively find matching commits.
485
405
- Comments?
486
+ Will merge to 'master'.
487
source: <xmqqbk5i3ncw.fsf_-_@gitster.g>
488
489
490
* ps/reftable-write-options (2024-05-13) 11 commits
410
- - refs/reftable: allow configuring geometric factor
411
- - reftable: make the compaction factor configurable
412
- - refs/reftable: allow disabling writing the object index
413
- - refs/reftable: allow configuring restart interval
414
- - reftable: use `uint16_t` to track restart interval
415
- - refs/reftable: allow configuring block size
416
- - reftable/dump: support dumping a table's block structure
417
- - reftable/writer: improve error when passed an invalid block size
418
- - reftable/writer: drop static variable used to initialize strbuf
419
- - reftable: pass opts as constant pointer
420
- - reftable: consistently refer to `reftable_write_options` as `opts`
491
+ (merged to 'next' on 2024-05-22 at ae8e378430)
492
+ + refs/reftable: allow configuring geometric factor
493
+ + reftable: make the compaction factor configurable
494
+ + refs/reftable: allow disabling writing the object index
495
+ + refs/reftable: allow configuring restart interval
496
+ + reftable: use `uint16_t` to track restart interval
497
+ + refs/reftable: allow configuring block size
498
+ + reftable/dump: support dumping a table's block structure
499
+ + reftable/writer: improve error when passed an invalid block size
500
+ + reftable/writer: drop static variable used to initialize strbuf
501
+ + reftable: pass opts as constant pointer
502
+ + reftable: consistently refer to `reftable_write_options` as `opts`
503
504
The knobs to tweak how reftable files are written have been made
505
available as configuration variables.
506
425
- Comments?
507
+ Will merge to 'master'.
508
source: <cover.1715587849.git.ps@pks.im>
509
510
@@ -438,6 +520,7 @@ Release tarballs are available at:
520
+ Documentation/glossary: define root refs as refs
521
+ Documentation/glossary: clarify limitations of pseudorefs
522
+ Documentation/glossary: redefine pseudorefs as special refs
523
+ (this branch is used by ps/ref-storage-migration.)
524
525
Terminology to call various ref-like things are getting
526
straightened out.
@@ -448,11 +531,12 @@ Release tarballs are available at:
531
532
533
* jc/rev-parse-fatal-doc (2024-05-01) 1 commit
451
- - rev-parse: document how --is-* options work outside a repository
534
+ (merged to 'next' on 2024-05-21 at 9bbb973b7b)
535
+ + rev-parse: document how --is-* options work outside a repository
536
537
Doc update.
538
455
- Comments?
539
+ Will merge to 'master'.
540
source: <xmqqplu54fbg.fsf@gitster.g>
541
542
@@ -522,26 +606,6 @@ Release tarballs are available at:
606
source: <20240328101356.300374-1-e@80x24.org>
607
608
525
-* la/hide-trailer-info (2024-05-02) 11 commits
526
- (merged to 'next' on 2024-05-15 at 955ffe4f37)
527
- + trailer unit tests: inspect iterator contents
528
- + trailer: document parse_trailers() usage
529
- + trailer: retire trailer_info_get() from API
530
- + trailer: make trailer_info struct private
531
- + trailer: make parse_trailers() return trailer_info pointer
532
- + interpret-trailers: access trailer_info with new helpers
533
- + sequencer: use the trailer iterator
534
- + trailer: teach iterator about non-trailer lines
535
- + trailer: add unit tests for trailer iterator
536
- + Makefile: sort UNIT_TEST_PROGRAMS
537
- + Merge branch 'la/format-trailer-info' into la/hide-trailer-info
538
-
539
- The trailer API has been reshuffled a bit.
540
-
541
- Will merge to 'master'.
542
- source: <pull.1696.v4.git.1714625667.gitgitgadget@gmail.com>
543
-
544
-
609
* ds/doc-config-reflow (2024-03-14) 1 commit
610
- config.txt: perform some minor reformatting
611
@@ -639,39 +703,3 @@ Release tarballs are available at:
703
704
Not ready to be reviewed yet.
705
source: <20230824205456.1231371-1-gitster@pobox.com>
642
-
643
---------------------------------------------------
644
-[Discarded]
645
-
646
-* tb/pseudo-merge-reachability-bitmap (2024-04-30) 23 commits
647
- . t/perf: implement performace tests for pseudo-merge bitmaps
648
- . pseudo-merge: implement support for finding existing merges
649
- . ewah: `bitmap_equals_ewah()`
650
- . pack-bitmap: extra trace2 information
651
- . pack-bitmap.c: use pseudo-merges during traversal
652
- . t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`
653
- . pack-bitmap: implement test helpers for pseudo-merge
654
- . ewah: implement `ewah_bitmap_popcount()`
655
- . pseudo-merge: implement support for reading pseudo-merge commits
656
- . pack-bitmap.c: read pseudo-merge extension
657
- . pseudo-merge: scaffolding for reads
658
- . pack-bitmap: extract `read_bitmap()` function
659
- . pack-bitmap-write.c: write pseudo-merge table
660
- . pack-bitmap-write.c: select pseudo-merge commits
661
- . pseudo-merge: implement support for selecting pseudo-merge commits
662
- . pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public
663
- . pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`
664
- . pack-bitmap-write: support storing pseudo-merge commits
665
- . pseudo-merge.ch: initial commit
666
- . pack-bitmap: move some initialization to `bitmap_writer_init()`
667
- . pack-bitmap: drop unused `max_bitmaps` parameter
668
- . ewah: implement `ewah_bitmap_is_subset()`
669
- . Documentation/technical: describe pseudo-merge bitmaps format
670
-
671
- The pack-bitmap machinery learned to write pseudo-merge bitmaps,
672
- which act as imaginary octopus merges covering un-bitmapped
673
- reference tips. This enhances bitmap coverage, and thus,
674
- performance, for repositories with many references using bitmaps.
675
-
676
- Retracted to be rebuilt on top of tb/pack-bitmap-write-cleanups topic
677
- source: <cover.1714422410.git.me@ttaylorr.com>