What's cooking (2024/05 #07)
Junio C Hamano committed
May 17, 2024 at 15:36 UTC
e1f0141d31ac0052e1ba131159ba268a31ea193d
1 file changed
+342
-304
whats-cooking.txt
+342
-304
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2024, #06; Tue, 14)
3
-X-master-at: 83f1add914c6b4682de1e944ec0d1ac043d53d78
4
-X-next-at: 74e4eb009334be9d0c81507039d39db2634c3a6b
2
+Subject: What's cooking in git.git (May 2024, #07; Fri, 17)
3
+X-master-at: d8ab1d464d07baa30e5a180eb33b3f9aa5c93adf
4
+X-next-at: de53f37879660c0da62a72472ba37f8680a3587c
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2024, #06; Tue, 14)
7
+What's cooking in git.git (May 2024, #07; Fri, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,9 +17,6 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
-Git 2.45.1 and friends have been released, and the integration
21
-branches for developers have all been updated to include them.
22
-
20
Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
22
repositories have only a subset of branches.
@@ -51,108 +48,297 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
54
-* fa/p4-error (2024-05-08) 1 commit
55
- (merged to 'next' on 2024-05-11 at 58fd3fbf2f)
56
- + git-p4: show Perforce error to the user
51
+* ds/scalar-reconfigure-all-fix (2024-05-07) 1 commit
52
+ (merged to 'next' on 2024-05-08 at eca398f4a5)
53
+ + scalar: avoid segfault in reconfigure --all
54
58
- P4 update.
59
- source: <pull.1668.v3.git.git.1715206266214.gitgitgadget@gmail.com>
55
+ Scalar fix.
56
+ source: <pull.1724.v3.git.1715126749391.gitgitgadget@gmail.com>
57
58
62
-* jc/git-gui-maintainer-update (2024-05-11) 1 commit
63
- (merged to 'next' on 2024-05-11 at 78c648537b)
64
- + SubmittingPatches: welcome the new maintainer of git-gui part
59
+* jl/git-no-advice (2024-05-07) 4 commits
60
+ (merged to 'next' on 2024-05-08 at c9e7e0866e)
61
+ + t0018: two small fixes
62
+ (merged to 'next' on 2024-05-06 at 95cc03ef96)
63
+ + advice: add --no-advice global option
64
+ + doc: add spacing around paginate options
65
+ + doc: clean up usage documentation for --no-* opts
66
66
- Will merge to 'master'.
67
+ A new global "--no-advice" option can be used to disable all advice
68
+ messages, which is meant to be used only in scripts.
69
+ source: <20240503071706.78109-1-james@jamesliu.io>
70
71
69
-* jc/no-default-attr-tree-in-bare (2024-05-03) 1 commit
70
- (merged to 'next' on 2024-05-08 at a34819b16d)
71
- + stop using HEAD for attributes in bare repository by default
72
- (this branch is used by ps/undecided-is-not-necessarily-sha1.)
72
+* jp/tag-trailer (2024-05-07) 3 commits
73
+ (merged to 'next' on 2024-05-07 at 646013793d)
74
+ + builtin/tag: add --trailer option
75
+ + builtin/commit: refactor --trailer logic
76
+ + builtin/commit: use ARGV macro to collect trailers
77
74
- Git 2.43 started using the tree of HEAD as the source of attributes
75
- in a bare repository, which has severe performance implications.
76
- For now, revert the change, without ripping out a more explicit
77
- support for the attr.tree configuration variable.
78
- source: <xmqqzft6aozg.fsf_-_@gitster.g>
78
+ "git tag" learned the "--trailer" option to futz with the trailers
79
+ in the same way as "git commit" does.
80
+ source: <pull.1723.v5.git.1714934950.gitgitgadget@gmail.com>
81
82
81
-* jc/test-workaround-broken-mv (2024-05-02) 1 commit
82
- (merged to 'next' on 2024-05-06 at 7e009c6827)
83
- + t/lib-chunk: work around broken "mv" on some vintage of macOS
83
+* js/unit-test-suite-runner (2024-05-06) 9 commits
84
+ (merged to 'next' on 2024-05-07 at 3b376223e3)
85
+ + cmake: let `test-tool` run the unit tests, too
86
+ + ci: use test-tool as unit test runner on Windows
87
+ + t/Makefile: run unit tests alongside shell tests
88
+ + unit tests: add rule for running with test-tool
89
+ + test-tool run-command testsuite: support unit tests
90
+ + test-tool run-command testsuite: remove hardcoded filter
91
+ + test-tool run-command testsuite: get shell from env
92
+ + t0080: turn t-basic unit test into a helper
93
+ + Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner
94
85
- Tests that try to corrupt in-repository files in chunked format did
86
- not work well on macOS due to its broken "mv", which has been
87
- worked around.
88
- source: <xmqqsez0c6ma.fsf@gitster.g>
95
+ The "test-tool" has been taught to run testsuite tests in parallel,
96
+ bypassing the need to use the "prove" tool.
97
+ source: <cover.1715024899.git.steadmon@google.com>
98
+ source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
99
100
91
-* jk/ci-macos-gcc13-fix (2024-05-09) 3 commits
92
- (merged to 'next' on 2024-05-11 at 571a90f095)
93
- + ci: stop installing "gcc-13" for osx-gcc
94
- + ci: avoid bare "gcc" for osx-gcc job
95
- + ci: drop mention of BREW_INSTALL_PACKAGES variable
101
+* jt/port-ci-whitespace-check-to-gitlab (2024-05-03) 5 commits
102
+ (merged to 'next' on 2024-05-08 at 774a29dde4)
103
+ + gitlab-ci: add whitespace error check
104
+ + ci: make the whitespace report optional
105
+ + ci: separate whitespace check script
106
+ + github-ci: fix link to whitespace error
107
+ + ci: pre-collapse GitLab CI sections
108
97
- CI fix.
98
- source: <20240509162219.GA1707955@coredump.intra.peff.net>
109
+ The "whitespace check" task that was enabled for GitHub Actions CI
110
+ has been ported to GitLab CI.
111
+ source: <20240503172110.181326-1-jltobler@gmail.com>
112
113
101
-* jk/ci-test-with-jgit-fix (2024-05-09) 1 commit
102
- (merged to 'next' on 2024-05-11 at 7d3d69657e)
103
- + ci: update coverity runs_on_pool reference
114
+* ow/refspec-glossary-update (2024-05-06) 1 commit
115
+ (merged to 'next' on 2024-05-07 at 7d55ebb0c8)
116
+ + Documentation: Mention that refspecs are explained elsewhere
117
105
- CI fix.
106
- source: <20240509161506.GA1707588@coredump.intra.peff.net>
118
+ Doc update.
119
+ source: <20240506182317.13477-1-oystwa@gmail.com>
120
121
109
-* ma/win32-unix-domain-socket (2024-05-03) 1 commit
110
- (merged to 'next' on 2024-05-06 at 799a546c96)
111
- + win32: fix building with NO_UNIX_SOCKETS
122
+* ps/config-subcommands (2024-05-06) 14 commits
123
+ (merged to 'next' on 2024-05-07 at f10c689a30)
124
+ + builtin/config: display subcommand help
125
+ + builtin/config: introduce "edit" subcommand
126
+ + builtin/config: introduce "remove-section" subcommand
127
+ + builtin/config: introduce "rename-section" subcommand
128
+ + builtin/config: introduce "unset" subcommand
129
+ + builtin/config: introduce "set" subcommand
130
+ + builtin/config: introduce "get" subcommand
131
+ + builtin/config: introduce "list" subcommand
132
+ + builtin/config: pull out function to handle `--null`
133
+ + builtin/config: pull out function to handle config location
134
+ + builtin/config: use `OPT_CMDMODE()` to specify modes
135
+ + builtin/config: move "fixed-value" option to correct group
136
+ + builtin/config: move option array around
137
+ + config: clarify memory ownership when preparing comment strings
138
+ (this branch is used by ps/builtin-config-cleanup.)
139
113
- Build fix.
114
- source: <20240503091427.2808390-1-mh@glandium.org>
140
+ The operation mode options (like "--get") the "git config" command
141
+ uses have been deprecated and replaced with subcommands (like "git
142
+ config get").
143
+ source: <cover.1714982328.git.ps@pks.im>
144
145
117
-* ps/ci-enable-minimal-fuzzers-at-gitlab (2024-05-06) 1 commit
118
- (merged to 'next' on 2024-05-07 at a76024bd9f)
119
- + gitlab-ci: add smoke test for fuzzers
120
- (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
146
+* ps/refs-without-the-repository (2024-05-07) 5 commits
147
+ (merged to 'next' on 2024-05-08 at 2479b9de46)
148
+ + refs: remove functions without ref store
149
+ + cocci: apply rules to rewrite callers of "refs" interfaces
150
+ + cocci: introduce rules to transform "refs" to pass ref store
151
+ + refs: add `exclude_patterns` parameter to `for_each_fullref_in()`
152
+ + refs: introduce missing functions that accept a `struct ref_store`
153
+ (this branch is used by ps/refs-without-the-repository-updates.)
154
+
155
+ The refs API lost functions that implicitly assumes to work on the
156
+ primary ref_store by forcing the callers to pass a ref_store as an
157
+ argument.
158
+ source: <cover.1715065736.git.ps@pks.im>
159
+
160
+
161
+* rs/external-diff-with-exit-code (2024-05-06) 1 commit
162
+ (merged to 'next' on 2024-05-08 at ad5fee3cbf)
163
+ + diff: report unmerged paths as changes in run_diff_cmd()
164
+
165
+ The "--exit-code" option of "git diff" command learned to report
166
+ unmerged paths as changes.
167
+
168
+ [jc: the tip one was reverted out]
169
+ source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de>
170
+
171
+
172
+* vd/doc-merge-tree-x-option (2024-05-07) 1 commit
173
+ (merged to 'next' on 2024-05-08 at 42637b8bdf)
174
+ + Documentation/git-merge-tree.txt: document -X
175
+
176
+ Doc update.
177
+ source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>
178
+
179
+--------------------------------------------------
180
+[New Topics]
181
+
182
+* tb/pack-bitmap-write-cleanups (2024-05-15) 6 commits
183
+ - pack-bitmap: introduce `bitmap_writer_free()`
184
+ - pack-bitmap-write.c: avoid uninitialized 'write_as' field
185
+ - pack-bitmap: drop unused `max_bitmaps` parameter
186
+ - pack-bitmap: avoid use of static `bitmap_writer`
187
+ - pack-bitmap-write.c: move commit_positions into commit_pos fields
188
+ - object.h: add flags allocated by pack-bitmap.h
189
+
190
+ The pack bitmap code saw some clean-up to prepare for a follow-up topic.
191
+
192
+ Will merge to 'next'?
193
+ source: <cover.1715716605.git.me@ttaylorr.com>
194
+
195
+
196
+* jc/t0017-clarify-bogus-expectation (2024-05-16) 1 commit
197
+ - t0017: clarify dubious test set-up
198
+
199
+ Test clean-up.
200
+
201
+ Will merge to 'next'?
202
+ source: <xmqqcypmx44l.fsf@gitster.g>
203
+
204
+
205
+* kn/osxkeychain-skip-idempotent-store (2024-05-15) 2 commits
206
+ - osxkeychain: state to skip unnecessary store operations
207
+ - osxkeychain: exclusive lock to serialize execution of operations
208
+
209
+ The credential helper that talks with osx keychain learned to avoid
210
+ storing back the authentication material it just got received from
211
+ the keychain.
212
+
213
+ Comments?
214
+ source: <pull.1729.v3.git.1715800868.gitgitgadget@gmail.com>
215
+
216
+
217
+* kn/update-ref-symref (2024-05-15) 7 commits
218
+ - update-ref: add support for 'symref-update' command
219
+ - reftable: pick either 'oid' or 'target' for new updates
220
+ - update-ref: add support for 'symref-create' command
221
+ - update-ref: add support for 'symref-delete' command
222
+ - update-ref: add support for 'symref-verify' command
223
+ - refs: create and use `ref_update_ref_must_exist()`
224
+ - Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref
225
+ (this branch uses kn/ref-transaction-symref.)
226
+
227
+ "git update-ref --stdin" learned to handle transactional updates of
228
+ symbolic-refs.
229
+
230
+ Expecting a reroll.
231
+ cf. <ZkXpcvF6dxGr6qmj@tanuki>
232
+ source: <20240514124411.1037019-1-knayak@gitlab.com>
233
122
- CI update.
123
- source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.git.ps@pks.im>
234
235
+* mt/t0211-typofix (2024-05-16) 1 commit
236
+ - t/t0211-trace2-perf.sh: fix typo patern -> pattern
237
126
-* ps/ci-fuzzers-at-gitlab-fix (2024-05-09) 3 commits
127
- (merged to 'next' on 2024-05-11 at f4307d4164)
128
- + gitlab-ci: fix installing dependencies for fuzz smoke tests
129
- + Merge branch 'ps/ci-python-2-deprecation' into ps/ci-fuzzers-at-gitlab-fix
130
- + Merge branch 'ps/ci-enable-minimal-fuzzers-at-gitlab' into ps/ci-fuzzers-at-gitlab-fix
131
- (this branch uses ps/ci-enable-minimal-fuzzers-at-gitlab and ps/ci-python-2-deprecation.)
238
+ Test fix.
239
133
- CI fix.
134
- source: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im>
240
+ Will merge to 'next'.
241
+ source: <ZkW5ggOVlglfi64u@telcontar>
242
+
243
+
244
+* ps/complete-config-w-subcommands (2024-05-17) 1 commit
245
+ - completion: adapt git-config(1) to complete subcommands
246
247
+ Update the command line completion script (in contrib/) to adjust
248
+ to the recent update to "git config" that adopted subcommand based
249
+ UI.
250
137
-* ps/ci-python-2-deprecation (2024-05-06) 1 commit
138
- (merged to 'next' on 2024-05-07 at 0e11e94f99)
139
- + ci: fix Python dependency on Ubuntu 24.04
140
- (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
251
+ Will merge to 'next'.
252
+ source: <8d43dee33289969a5afbbf7635ac40b7312d8e19.1715926344.git.ps@pks.im>
253
+
254
+
255
+* ps/refs-without-the-repository-updates (2024-05-17) 17 commits
256
+ - refs/packed: remove references to `the_hash_algo`
257
+ - refs/files: remove references to `the_hash_algo`
258
+ - refs/files: use correct repository
259
+ - refs: remove `dwim_log()`
260
+ - refs: drop `git_default_branch_name()`
261
+ - refs: pass repo when peeling objects
262
+ - refs: move object peeling into "object.c"
263
+ - refs: pass ref store when detecting dangling symrefs
264
+ - refs: convert iteration over replace refs to accept ref store
265
+ - refs: retrieve worktree ref stores via associated repository
266
+ - refs: refactor `resolve_gitlink_ref()` to accept a repository
267
+ - refs: pass repo when retrieving submodule ref store
268
+ - refs: track ref stores via strmap
269
+ - refs: implement releasing ref storages
270
+ - refs: rename `init_db` callback to avoid confusion
271
+ - refs: adjust names for `init` and `init_db` callbacks
272
+ - Merge branch 'ps/refs-without-the-repository' into ps/refs-without-the-repository-updates
273
+
274
+ Further clean-up the refs subsystem to stop relying on
275
+ the_repository, and instead use the repository associated to the
276
+ ref_store object.
277
+
278
+ Will merge to 'next'?
279
+ source: <cover.1715929858.git.ps@pks.im>
280
+
281
+
282
+* jc/doc-diff-name-only (2024-05-17) 1 commit
283
+ - diff: document what --name-only shows
284
+
285
+ The documentation for "git diff --name-only" has been clarified
286
+ that it is about showing the names in the post-image tree.
287
+
288
+ Will merge to 'next'.
289
+ source: <xmqqeda0jr7d.fsf@gitster.g>
290
142
- Unbreak CI jobs so that we do not attempt to use Python 2 that has
143
- been removed from the platform.
144
- source: <cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im>
291
+
292
+* kn/patch-iteration-doc (2024-05-17) 2 commits
293
+ - SubmittingPatches: add section for iterating patches
294
+ - Merge branch 'jc/patch-flow-updates' into kn/patch-iteration-doc
295
+ (this branch uses jc/patch-flow-updates.)
296
+
297
+ Doc updates.
298
+
299
+ Will merge to 'next'.
300
+ source: <20240517122724.270706-1-knayak@gitlab.com>
301
+
302
+
303
+* mt/openindiana-portability (2024-05-17) 7 commits
304
+ (merged to 'next' on 2024-05-17 at de53f37879)
305
+ + t/t9001-send-email.sh: sed - remove the i flag for s
306
+ + t/t9118-git-svn-funky-branch-names.sh: sed needs semicolon
307
+ + t/t1700-split-index.sh: mv -v is not portable
308
+ + t/t4202-log.sh: fix misspelled variable
309
+ + t/t0600-reffiles-backend.sh: rm -v is not portable
310
+ + t/t9902-completion.sh: backslashes in echo
311
+ + Switch grep from non-portable BRE to portable ERE
312
+
313
+ Portability updates to various uses of grep and sed.
314
+
315
+ Will merge to 'master'.
316
+ source: <ZkeMiifGHkIsehz3@telcontar>
317
+
318
+
319
+* mt/openindiana-scalar (2024-05-17) 1 commit
320
+ - scalar: make enlistment delete to work on all POSIX platforms
321
+
322
+ Avoid removing the $(cwd) for portability.
323
+
324
+ Needs review.
325
+ source: <Zkds81OB7C5bTCl_@telcontar>
326
327
147
-* tb/attr-limits (2024-05-03) 1 commit
148
- (merged to 'next' on 2024-05-06 at b98150cc71)
149
- + attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()
328
+* ts/archive-prefix-with-add-virtual-file (2024-05-17) 1 commit
329
+ - archive: make --add-virtual-file honor --prefix
330
151
- The maximum size of attribute files is enforced more consistently.
152
- source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com>
331
+ source: <pull.1719.v2.git.git.1715967267420.gitgitgadget@gmail.com>
332
+
333
+
334
+* js/doc-decisions (2024-05-17) 1 commit
335
+ - doc: describe the project's decision-making process
336
+
337
+ The project decision making policy has been documented.
338
+ source: <10f217915600eda3ebec886e4f020f87c22e318a.1715978031.git.steadmon@google.com>
339
340
--------------------------------------------------
155
-[New Topics]
341
+[Cooking]
342
343
* jc/compat-regex-calloc-fix (2024-05-13) 1 commit
344
(merged to 'next' on 2024-05-13 at 077c4e1dcc)
@@ -166,7 +352,7 @@ Release tarballs are available at:
352
source: <xmqqbk5bim2n.fsf@gitster.g>
353
354
169
-* jc/undecided-is-not-necessarily-sha1-fix (2024-05-13) 6 commits
355
+* jc/undecided-is-not-necessarily-sha1-fix (2024-05-16) 6 commits
356
- apply: fix uninitialized hash function
357
- builtin/hash-object: fix uninitialized hash function
358
- builtin/patch-id: fix uninitialized hash function
@@ -186,20 +372,26 @@ Release tarballs are available at:
372
373
374
* dg/fetch-pack-code-cleanup (2024-05-13) 1 commit
189
- - fetch-pack: remove unused 'struct loose_object_iter'
375
+ (merged to 'next' on 2024-05-17 at c8f8136d2e)
376
+ + fetch-pack: remove unused 'struct loose_object_iter'
377
378
+ Code clean-up to remove an unused struct definition.
379
+
380
+ Will merge to 'master'.
381
source: <20240512005913.342287-1-dave@treblig.org>
382
383
384
* dm/update-index-doc-fix (2024-05-13) 1 commit
195
- - documentation: git-update-index: add --show-index-version to synopsis
385
+ (merged to 'next' on 2024-05-17 at 2f6cd0d1cc)
386
+ + documentation: git-update-index: add --show-index-version to synopsis
387
+
388
+ Doc fix.
389
390
+ Will merge to 'master'.
391
source: <20240512031400.28416-1-dov.murik@linux.dev>
392
199
---------------------------------------------------
200
-[Cooking]
393
202
-* ps/builtin-config-cleanup (2024-05-13) 22 commits
394
+* ps/builtin-config-cleanup (2024-05-15) 22 commits
395
- builtin/config: pass data between callbacks via local variables
396
- builtin/config: convert flags to a local variable
397
- builtin/config: track "fixed value" option via flags only
@@ -222,32 +414,21 @@ Release tarballs are available at:
414
- builtin/config: move legacy mode into its own function
415
- builtin/config: stop printing full usage on misuse
416
- Merge branch 'ps/config-subcommands' into ps/builtin-config-cleanup
225
- (this branch uses ps/config-subcommands.)
417
418
Code clean-up to reduce inter-function communication inside
419
builtin/config.c done via the use of global variables.
420
230
- Comments?
231
- source: <cover.1715595550.git.ps@pks.im>
232
-
233
-
234
-* vd/doc-merge-tree-x-option (2024-05-07) 1 commit
235
- (merged to 'next' on 2024-05-08 at 42637b8bdf)
236
- + Documentation/git-merge-tree.txt: document -X
421
+ Will merge to 'next'?
422
+ source: <cover.1715755055.git.ps@pks.im>
423
238
- Doc update.
424
240
- Will merge to 'master'.
241
- source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>
242
-
243
-
244
-* jc/doc-manpages-l10n (2024-05-09) 1 commit
425
+* jc/doc-manpages-l10n (2024-05-17) 1 commit
426
- SubmittingPatches: advertise git-manpages-l10n project a bit
427
428
The SubmittingPatches document now refers folks to manpages
429
translation project.
430
250
- Comments?
431
+ Will merge to 'next'.
432
source: <xmqqv83muc12.fsf@gitster.g>
433
434
@@ -284,23 +465,26 @@ Release tarballs are available at:
465
466
467
* jc/patch-flow-updates (2024-05-10) 2 commits
287
- - SubmittingPatches: extend the "flow" section
288
- - SubmittingPatches: move the patch-flow section earlier
468
+ (merged to 'next' on 2024-05-16 at d7a885574b)
469
+ + SubmittingPatches: extend the "flow" section
470
+ + SubmittingPatches: move the patch-flow section earlier
471
+ (this branch is used by kn/patch-iteration-doc.)
472
473
Doc updates.
474
292
- Comments?
475
+ Will merge to 'master'.
476
source: <20240510165526.1412338-1-gitster@pobox.com>
477
478
479
* it/refs-name-conflict (2024-05-06) 1 commit
297
- - refs: return conflict error when checking packed refs
480
+ (merged to 'next' on 2024-05-15 at 39ef3ecc88)
481
+ + refs: return conflict error when checking packed refs
482
483
Expose "name conflict" error when a ref creation fails due to D/F
484
conflict in the ref namespace, to improve an error message given by
485
"git fetch".
486
303
- Will merge to 'next'.
487
+ Will merge to 'master'.
488
source: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com>
489
490
@@ -314,71 +498,6 @@ Release tarballs are available at:
498
source: <xmqqbk5i3ncw.fsf_-_@gitster.g>
499
500
317
-* jp/tag-trailer (2024-05-07) 3 commits
318
- (merged to 'next' on 2024-05-07 at 646013793d)
319
- + builtin/tag: add --trailer option
320
- + builtin/commit: refactor --trailer logic
321
- + builtin/commit: use ARGV macro to collect trailers
322
-
323
- "git tag" learned the "--trailer" option to futz with the trailers
324
- in the same way as "git commit" does.
325
-
326
- Will merge to 'master'.
327
- source: <pull.1723.v5.git.1714934950.gitgitgadget@gmail.com>
328
-
329
-
330
-* ow/refspec-glossary-update (2024-05-06) 1 commit
331
- (merged to 'next' on 2024-05-07 at 7d55ebb0c8)
332
- + Documentation: Mention that refspecs are explained elsewhere
333
-
334
- Doc update.
335
-
336
- Will merge to 'master'.
337
- source: <20240506182317.13477-1-oystwa@gmail.com>
338
-
339
-
340
-* rs/external-diff-with-exit-code (2024-05-06) 2 commits
341
- (merged to 'next' on 2024-05-08 at ad5fee3cbf)
342
- + diff: fix --exit-code with external diff
343
- + diff: report unmerged paths as changes in run_diff_cmd()
344
-
345
- The "--exit-code" option of "git diff" command learned to work with
346
- the "--ext-diff" option.
347
-
348
- Will merge to 'master'.
349
- source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de>
350
-
351
-
352
-* jt/port-ci-whitespace-check-to-gitlab (2024-05-03) 5 commits
353
- (merged to 'next' on 2024-05-08 at 774a29dde4)
354
- + gitlab-ci: add whitespace error check
355
- + ci: make the whitespace report optional
356
- + ci: separate whitespace check script
357
- + github-ci: fix link to whitespace error
358
- + ci: pre-collapse GitLab CI sections
359
-
360
- The "whitespace check" task that was enabled for GitHub Actions CI
361
- has been ported to GitLab CI.
362
-
363
- Will merge to 'master'.
364
- source: <20240503172110.181326-1-jltobler@gmail.com>
365
-
366
-
367
-* jl/git-no-advice (2024-05-07) 4 commits
368
- (merged to 'next' on 2024-05-08 at c9e7e0866e)
369
- + t0018: two small fixes
370
- (merged to 'next' on 2024-05-06 at 95cc03ef96)
371
- + advice: add --no-advice global option
372
- + doc: add spacing around paginate options
373
- + doc: clean up usage documentation for --no-* opts
374
-
375
- A new global "--no-advice" option can be used to disable all advice
376
- messages, which is meant to be used only in scripts.
377
-
378
- Will merge to 'master'.
379
- source: <20240503071706.78109-1-james@jamesliu.io>
380
-
381
-
501
* kn/ref-transaction-symref (2024-05-07) 8 commits
502
(merged to 'next' on 2024-05-11 at 0a7119f2a3)
503
+ refs: remove `create_symref` and associated dead code
@@ -389,6 +508,7 @@ Release tarballs are available at:
508
+ refs: support symrefs in 'reference-transaction' hook
509
+ files-backend: extract out `create_symref_lock()`
510
+ refs: accept symref values in `ref_transaction_update()`
511
+ (this branch is used by kn/update-ref-symref.)
512
513
Updates to symbolic refs can now be made as a part of ref
514
transaction.
@@ -397,48 +517,6 @@ Release tarballs are available at:
517
source: <20240507125859.132116-1-knayak@gitlab.com>
518
519
400
-* ps/config-subcommands (2024-05-06) 14 commits
401
- (merged to 'next' on 2024-05-07 at f10c689a30)
402
- + builtin/config: display subcommand help
403
- + builtin/config: introduce "edit" subcommand
404
- + builtin/config: introduce "remove-section" subcommand
405
- + builtin/config: introduce "rename-section" subcommand
406
- + builtin/config: introduce "unset" subcommand
407
- + builtin/config: introduce "set" subcommand
408
- + builtin/config: introduce "get" subcommand
409
- + builtin/config: introduce "list" subcommand
410
- + builtin/config: pull out function to handle `--null`
411
- + builtin/config: pull out function to handle config location
412
- + builtin/config: use `OPT_CMDMODE()` to specify modes
413
- + builtin/config: move "fixed-value" option to correct group
414
- + builtin/config: move option array around
415
- + config: clarify memory ownership when preparing comment strings
416
- (this branch is used by ps/builtin-config-cleanup.)
417
-
418
- The operation mode options (like "--get") the "git config" command
419
- uses have been deprecated and replaced with subcommands (like "git
420
- config get").
421
-
422
- Will merge to 'master'.
423
- source: <cover.1714982328.git.ps@pks.im>
424
-
425
-
426
-* ps/refs-without-the-repository (2024-05-07) 5 commits
427
- (merged to 'next' on 2024-05-08 at 2479b9de46)
428
- + refs: remove functions without ref store
429
- + cocci: apply rules to rewrite callers of "refs" interfaces
430
- + cocci: introduce rules to transform "refs" to pass ref store
431
- + refs: add `exclude_patterns` parameter to `for_each_fullref_in()`
432
- + refs: introduce missing functions that accept a `struct ref_store`
433
-
434
- The refs API lost functions that implicitly assumes to work on the
435
- primary ref_store by forcing the callers to pass a ref_store as an
436
- argument.
437
-
438
- Will merge to 'master'.
439
- source: <cover.1715065736.git.ps@pks.im>
440
-
441
-
520
* ps/reftable-write-options (2024-05-13) 11 commits
521
- refs/reftable: allow configuring geometric factor
522
- reftable: make the compaction factor configurable
@@ -459,23 +537,13 @@ Release tarballs are available at:
537
source: <cover.1715587849.git.ps@pks.im>
538
539
462
-* ds/scalar-reconfigure-all-fix (2024-05-07) 1 commit
463
- (merged to 'next' on 2024-05-08 at eca398f4a5)
464
- + scalar: avoid segfault in reconfigure --all
465
-
466
- Scalar fix.
467
-
468
- Will merge to 'master'.
469
- source: <pull.1724.v3.git.1715126749391.gitgitgadget@gmail.com>
470
-
471
-
472
-* ps/pseudo-ref-terminology (2024-05-10) 10 commits
540
+* ps/pseudo-ref-terminology (2024-05-15) 10 commits
541
- refs: refuse to write pseudorefs
542
- ref-filter: properly distinuish pseudo and root refs
543
- refs: pseudorefs are no refs
544
- refs: classify HEAD as a root ref
477
- - refs: root refs can be symbolic refs
478
- - refs: refname `is_special_ref()` to `is_pseudo_ref()`
545
+ - refs: do not check ref existence in `is_root_ref()`
546
+ - refs: rename `is_special_ref()` to `is_pseudo_ref()`
547
- refs: rename `is_pseudoref()` to `is_root_ref()`
548
- Documentation/glossary: define root refs as refs
549
- Documentation/glossary: clarify limitations of pseudorefs
@@ -484,8 +552,9 @@ Release tarballs are available at:
552
Terminology to call various ref-like things are getting
553
straightened out.
554
487
- Comments?
488
- source: <cover.1715330206.git.ps@pks.im>
555
+ Will merge to 'next'?
556
+ cf. <vgzwb5xnlvz2gfiqamzrfcjs2xya3zhhoootyzopfpdrjapayq@wfsomyal4cf6>
557
+ source: <cover.1715755591.git.ps@pks.im>
558
559
560
* jc/rev-parse-fatal-doc (2024-05-01) 1 commit
@@ -538,15 +607,15 @@ Release tarballs are available at:
607
source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com>
608
609
541
-* ds/send-email-per-message-block (2024-04-10) 2 commits
542
- - send-email: make it easy to discern the messages for each patch
610
+* ds/send-email-per-message-block (2024-04-10) 1 commit
611
- send-email: move newline characters out of a few translatable strings
612
545
- "git send-email" learned to separate its reports on each message it
546
- sends out with an extra blank line in between.
613
+ Preliminary code clean-up for "git send-email".
614
548
- Comments?
549
- source: <cover.1712732383.git.dsimic@manjaro.org>
615
+ Will merge to 'next'.
616
+ The topmost commit in the original series was dropped per author's request.
617
+ cf. <a07d3807a24f6d68cb48ee48366ae25e@manjaro.org>
618
+ source: <29ea3a9b07bf1aa17b5d6a1e41325379c494bcb2.1712732383.git.dsimic@manjaro.org>
619
620
621
* ew/khash-to-khashl (2024-03-28) 3 commits
@@ -562,57 +631,23 @@ Release tarballs are available at:
631
source: <20240328101356.300374-1-e@80x24.org>
632
633
565
-* tb/pseudo-merge-reachability-bitmap (2024-04-30) 23 commits
566
- - t/perf: implement performace tests for pseudo-merge bitmaps
567
- - pseudo-merge: implement support for finding existing merges
568
- - ewah: `bitmap_equals_ewah()`
569
- - pack-bitmap: extra trace2 information
570
- - pack-bitmap.c: use pseudo-merges during traversal
571
- - t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`
572
- - pack-bitmap: implement test helpers for pseudo-merge
573
- - ewah: implement `ewah_bitmap_popcount()`
574
- - pseudo-merge: implement support for reading pseudo-merge commits
575
- - pack-bitmap.c: read pseudo-merge extension
576
- - pseudo-merge: scaffolding for reads
577
- - pack-bitmap: extract `read_bitmap()` function
578
- - pack-bitmap-write.c: write pseudo-merge table
579
- - pack-bitmap-write.c: select pseudo-merge commits
580
- - pseudo-merge: implement support for selecting pseudo-merge commits
581
- - pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public
582
- - pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`
583
- - pack-bitmap-write: support storing pseudo-merge commits
584
- - pseudo-merge.ch: initial commit
585
- - pack-bitmap: move some initialization to `bitmap_writer_init()`
586
- - pack-bitmap: drop unused `max_bitmaps` parameter
587
- - ewah: implement `ewah_bitmap_is_subset()`
588
- - Documentation/technical: describe pseudo-merge bitmaps format
589
-
590
- The pack-bitmap machinery learned to write pseudo-merge bitmaps,
591
- which act as imaginary octopus merges covering un-bitmapped
592
- reference tips. This enhances bitmap coverage, and thus,
593
- performance, for repositories with many references using bitmaps.
594
-
595
- Needs review.
596
- source: <cover.1714422410.git.me@ttaylorr.com>
597
-
598
-
634
* la/hide-trailer-info (2024-05-02) 11 commits
600
- - trailer unit tests: inspect iterator contents
601
- - trailer: document parse_trailers() usage
602
- - trailer: retire trailer_info_get() from API
603
- - trailer: make trailer_info struct private
604
- - trailer: make parse_trailers() return trailer_info pointer
605
- - interpret-trailers: access trailer_info with new helpers
606
- - sequencer: use the trailer iterator
607
- - trailer: teach iterator about non-trailer lines
608
- - trailer: add unit tests for trailer iterator
609
- - Makefile: sort UNIT_TEST_PROGRAMS
610
- - Merge branch 'la/format-trailer-info' into la/hide-trailer-info
635
+ (merged to 'next' on 2024-05-15 at 955ffe4f37)
636
+ + trailer unit tests: inspect iterator contents
637
+ + trailer: document parse_trailers() usage
638
+ + trailer: retire trailer_info_get() from API
639
+ + trailer: make trailer_info struct private
640
+ + trailer: make parse_trailers() return trailer_info pointer
641
+ + interpret-trailers: access trailer_info with new helpers
642
+ + sequencer: use the trailer iterator
643
+ + trailer: teach iterator about non-trailer lines
644
+ + trailer: add unit tests for trailer iterator
645
+ + Makefile: sort UNIT_TEST_PROGRAMS
646
+ + Merge branch 'la/format-trailer-info' into la/hide-trailer-info
647
648
The trailer API has been reshuffled a bit.
649
614
- Waiting for a review response.
615
- cf. <a75133dc-a0bb-4f61-a616-988f2b4d5688@gmail.com>
650
+ Will merge to 'master'.
651
source: <pull.1696.v4.git.1714625667.gitgitgadget@gmail.com>
652
653
@@ -651,26 +686,6 @@ Release tarballs are available at:
686
source: <cover.1696021277.git.jonathantanmy@google.com>
687
688
654
-* js/unit-test-suite-runner (2024-05-06) 9 commits
655
- (merged to 'next' on 2024-05-07 at 3b376223e3)
656
- + cmake: let `test-tool` run the unit tests, too
657
- + ci: use test-tool as unit test runner on Windows
658
- + t/Makefile: run unit tests alongside shell tests
659
- + unit tests: add rule for running with test-tool
660
- + test-tool run-command testsuite: support unit tests
661
- + test-tool run-command testsuite: remove hardcoded filter
662
- + test-tool run-command testsuite: get shell from env
663
- + t0080: turn t-basic unit test into a helper
664
- + Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner
665
-
666
- The "test-tool" has been taught to run testsuite tests in parallel,
667
- bypassing the need to use the "prove" tool.
668
-
669
- Will merge to 'master'.
670
- source: <cover.1715024899.git.steadmon@google.com>
671
- source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
672
-
673
-
689
* bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit
690
- completion: dir-type optargs for am, format-patch
691
@@ -737,12 +752,35 @@ Release tarballs are available at:
752
--------------------------------------------------
753
[Discarded]
754
740
-* js/cmake-with-test-tool (2024-04-30) 2 commits
741
- . cmake: let `test-tool` run the unit tests, too
742
- . Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool
743
- (this branch uses js/unit-test-suite-runner.)
755
+* tb/pseudo-merge-reachability-bitmap (2024-04-30) 23 commits
756
+ . t/perf: implement performace tests for pseudo-merge bitmaps
757
+ . pseudo-merge: implement support for finding existing merges
758
+ . ewah: `bitmap_equals_ewah()`
759
+ . pack-bitmap: extra trace2 information
760
+ . pack-bitmap.c: use pseudo-merges during traversal
761
+ . t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`
762
+ . pack-bitmap: implement test helpers for pseudo-merge
763
+ . ewah: implement `ewah_bitmap_popcount()`
764
+ . pseudo-merge: implement support for reading pseudo-merge commits
765
+ . pack-bitmap.c: read pseudo-merge extension
766
+ . pseudo-merge: scaffolding for reads
767
+ . pack-bitmap: extract `read_bitmap()` function
768
+ . pack-bitmap-write.c: write pseudo-merge table
769
+ . pack-bitmap-write.c: select pseudo-merge commits
770
+ . pseudo-merge: implement support for selecting pseudo-merge commits
771
+ . pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public
772
+ . pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`
773
+ . pack-bitmap-write: support storing pseudo-merge commits
774
+ . pseudo-merge.ch: initial commit
775
+ . pack-bitmap: move some initialization to `bitmap_writer_init()`
776
+ . pack-bitmap: drop unused `max_bitmaps` parameter
777
+ . ewah: implement `ewah_bitmap_is_subset()`
778
+ . Documentation/technical: describe pseudo-merge bitmaps format
779
745
- "test-tool" is now built in CMake build to also run the unit tests.
780
+ The pack-bitmap machinery learned to write pseudo-merge bitmaps,
781
+ which act as imaginary octopus merges covering un-bitmapped
782
+ reference tips. This enhances bitmap coverage, and thus,
783
+ performance, for repositories with many references using bitmaps.
784
747
- Rolled into the base topic.
748
- source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
785
+ Retracted to be rebuilt on top of tb/pack-bitmap-write-cleanups topic
786
+ source: <cover.1714422410.git.me@ttaylorr.com>