What's cooking (2022/11 #2)
Taylor Blau committed
Nov 8, 2022 at 18:09 UTC
9e3f2dfb754145f8d2b0b45c2be1ca2e16fbe2f6
1 file changed
+473
-227
whats-cooking.txt
+473
-227
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2022, #01; Thu, 3)
3
-X-master-at: 3b08839926fcc7cc48cf4c759737c1a71af430c1
4
-X-next-at: 58b659f92b25267976ae36dbe1e7cb129f8f5311
2
+Subject: What's cooking in git.git (Nov 2022, #02; Tue, 8)
3
+X-master-at: 319605f8f00e402f3ea758a02c63534ff800a711
4
+X-next-at: 0f3c55d4c2b7864bffb2d92278eff08d0b2e083f
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2022, #01; Thu, 3)
7
+What's cooking in git.git (Nov 2022, #02; Tue, 8)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,9 +14,11 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
14
considered "accepted" at all. A topic without enough support may be
15
discarded after a long period of no activity.
16
17
-A large-ish handful of topics are awaiting review. I'll continue to
18
-hold those topics in 'seen' until they have enough attention to feel
19
-comfortable merging them down.
17
+A handful of topics are still sitting in 'seen' waiting review. They
18
+are marked accordingly below. Otherwise, a number of topics have
19
+graduated, and the slate for 'next' is relatively small. Hopefully
20
+some additional review effort will mean that we can graduate some of
21
+those topics to 'next' in the next round of integration.
22
23
Copies of the source code to Git live in many repositories, and the
24
following is a list of the ones I push into or their mirrors. Some
@@ -51,38 +53,25 @@ for convenience (replace "htmldocs" with "manpages" for the manual
53
https://www.kernel.org/pub/software/scm/git/
54
55
--------------------------------------------------
54
-[New Topics]
55
-
56
-* ab/submodule-helper-prep-only (2022-11-02) 8 commits
57
- - submodule--helper: use OPT_SUBCOMMAND() API
58
- - submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
59
- - submodule--helper: remove --prefix from "absorbgitdirs"
60
- - submodule API & "absorbgitdirs": remove "----recursive" option
61
- - submodule.c: refactor recursive block out of absorb function
62
- - submodule tests: test for a "foreach" blind-spot
63
- - submodule tests: add tests for top-level flag output
64
- - submodule--helper: move "config" to a test-tool
56
+[Graduated to 'master']
57
66
- Preparation to remove git-submodule.sh and replace it with a builtin.
67
-
68
- Waiting for review?
69
- source: <cover-0.8-00000000000-20221102T074148Z-avarab@gmail.com>
58
+* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
59
+ (merged to 'next' on 2022-11-03 at 4079e1b06b)
60
+ + config: let feature.experimental imply gc.cruftPacks=true
61
+ + gc: add tests for --cruft and friends
62
63
+ Enable gc.cruftpacks by default for those who opt into
64
+ feature.experimental setting.
65
+ source: <cover.1666819953.git.me@ttaylorr.com>
66
72
-* ds/bundle-uri-4 (2022-10-31) 9 commits
73
- - clone: unbundle the advertised bundles
74
- - bundle-uri: download bundles from an advertised list
75
- - bundle-uri: allow relative URLs in bundle lists
76
- - strbuf: reintroduce strbuf_parent_directory()
77
- - bundle-uri client: add boolean transfer.bundleURI setting
78
- - bundle-uri: serve bundle.* keys from config
79
- - bundle-uri client: add helper for testing server
80
- - bundle-uri client: add minimal NOOP client
81
- - protocol v2: add server-side "bundle-uri" skeleton
67
83
- Bundle URIs part 4.
68
+* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
69
+ (merged to 'next' on 2022-11-03 at 32bfd99ffd)
70
+ + adjust_shared_perm(): leave g+s alone when the group does not matter
71
85
- source: <pull.1400.git.1667264854.gitgitgadget@gmail.com>
72
+ The adjust_shared_perm() helper function learned to refrain from
73
+ setting the "g+s" bit on directories when it is not necessary.
74
+ source: <xmqqr0yrhco6.fsf@gitster.g>
75
76
77
* jk/ref-filter-parsing-bugs (2022-11-02) 2 commits
@@ -93,8 +82,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
82
Various tests exercising the transfer.credentialsInUrl configuration
83
are taught to avoid making requests which require resolving localhost
84
to reduce CI-flakiness.
96
-
97
- Will merge to 'master'.
85
source: <Y2IeqOT5Ao1Qa0Zl@coredump.intra.peff.net>
86
87
@@ -103,70 +90,318 @@ for convenience (replace "htmldocs" with "manpages" for the manual
90
+ test-lib-functions: drop redundant diagnostic print
91
92
A redundant diagnostic message is dropped from test_path_is_missing().
106
-
107
- Will merge to 'master'.
93
source: <20221031180048.5766-1-martin.agren@gmail.com>
94
95
111
-* sg/plug-line-log-leaks (2022-11-02) 3 commits
112
- - diff.c: use diff_free_queue()
113
- - line-log: free the diff queues' arrays when processing merge commits
114
- - line-log: free diff queue when processing non-merge commits
96
+* po/glossary-around-traversal (2022-10-30) 4 commits
97
+ (merged to 'next' on 2022-11-03 at 58b659f92b)
98
+ + glossary: add reachability bitmap description
99
+ + glossary: add "commit graph" description
100
+ + doc: use 'object database' not ODB or abbreviation
101
+ + doc: use "commit-graph" hyphenation consistently
102
116
- A handful of leaks in the line-log machinery have been plugged.
103
+ The glossary entries for "commit-graph file" and "reachability
104
+ bitmap" have been added.
105
+ source: <20221029164112.2097-1-philipoakley@iee.email>
106
118
- Expecting a reroll.
119
- source: <20221102220142.574890-1-szeder.dev@gmail.com>
107
108
+* rs/archive-filter-error-once (2022-10-30) 1 commit
109
+ (merged to 'next' on 2022-11-03 at c2d1004d96)
110
+ + archive-tar: report filter start error only once
111
122
-* tb/branch-delete-detached (2022-11-01) 1 commit
123
- - branch: gracefully handle '-d' on detached HEAD
112
+ "git archive" mistakenly complained twice about a missing executable,
113
+ which has been corrected.
114
+ source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>
115
125
- 'git branch -d' is taught to ignore failures to resolve HEAD when
126
- detached.
116
128
- Expecting a reroll.
129
- source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com>
117
+* rs/no-more-run-command-v (2022-10-30) 12 commits
118
+ (merged to 'next' on 2022-11-03 at 27eb80811c)
119
+ + replace and remove run_command_v_opt()
120
+ + replace and remove run_command_v_opt_cd_env_tr2()
121
+ + replace and remove run_command_v_opt_tr2()
122
+ + replace and remove run_command_v_opt_cd_env()
123
+ + use child_process members "args" and "env" directly
124
+ + use child_process member "args" instead of string array variable
125
+ + sequencer: simplify building argument list in do_exec()
126
+ + bisect--helper: factor out do_bisect_run()
127
+ + bisect: simplify building "checkout" argument list
128
+ + am: simplify building "show" argument list
129
+ + run-command: fix return value comment
130
+ + merge: remove always-the-same "verbose" arguments
131
132
+ Simplify the run-command API.
133
+ source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de>
134
132
-* tb/howto-maintain-git-fixes (2022-10-31) 2 commits
133
- - Documentation: build redo-seen.sh from jch..seen
134
- - Documentation: build redo-jch.sh from master..jch
135
- (this branch uses tb/howto-using-redo-script.)
135
137
- A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
136
+* tb/howto-using-redo-script (2022-10-26) 1 commit
137
+ (merged to 'next' on 2022-11-03 at 521600fd56)
138
+ + Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
139
+ (this branch is used by tb/howto-maintain-git-fixes.)
140
+
141
+ Doc update.
142
+ source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
143
+
144
+--------------------------------------------------
145
+[New Topics]
146
+
147
+* ab/rev-info-init (2022-11-08) 1 commit
148
+ (merged to 'next' on 2022-11-08 at 909ad9ed3a)
149
+ + revisions API: extend the nascent REV_INFO_INIT macro
150
+
151
+ Progress on being able to initialize a rev_info struct with a macro.
152
+
153
+ Will merge to 'master'.
154
+ source: <patch-1.1-c3afcd69ddb-20221108T140134Z-avarab@gmail.com>
155
+
156
+
157
+* ab/various-leak-fixes (2022-11-08) 16 commits
158
+ - built-ins: use free() not UNLEAK() if trivial, rm dead code
159
+ - revert: fix parse_options_concat() leak
160
+ - cherry-pick: free "struct replay_opts" members
161
+ - rebase: don't leak on "--abort"
162
+ - connected.c: free the "struct packed_git"
163
+ - sequencer.c: fix "opts->strategy" leak in read_strategy_opts()
164
+ - ls-files: fix a --with-tree memory leak
165
+ - revision API: call graph_clear() in release_revisions()
166
+ - unpack-file: fix ancient leak in create_temp_file()
167
+ - built-ins & libs & helpers: add/move destructors, fix leaks
168
+ - dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"
169
+ - read-cache.c: clear and free "sparse_checkout_patterns"
170
+ - commit: discard partial cache before (re-)reading it
171
+ - {reset,merge}: call discard_index() before returning
172
+ - tests: mark tests as passing with SANITIZE=leak
173
+ - Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes
174
+ (this branch uses pw/rebase-no-reflog-action.)
175
+
176
+ Various leak fixes.
177
178
Will merge to 'next'.
140
- source: <cover.1667260044.git.me@ttaylorr.com>
179
+ source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>
180
181
143
-* tl/pack-bitmap-absolute-paths (2022-11-02) 1 commit
144
- - pack-bitmap.c: avoid exposing absolute paths
182
+* aw/complete-case-insensitive (2022-11-07) 2 commits
183
+ - completion: add case-insensitive match of pseudorefs
184
+ - completion: add optional ignore-case when matching refs
185
+
186
+ Introduce a case insensitive mode to the Bash completion helpers.
187
+
188
+ Waiting for review.
189
+ source: <pull.1374.git.git.1667669315.gitgitgadget@gmail.com>
190
+
191
+
192
+* dd/bisect-helper-subcommand (2022-11-05) 3 commits
193
+ (merged to 'next' on 2022-11-08 at 3951bf0f12)
194
+ + bisect--helper: parse subcommand with OPT_SUBCOMMAND
195
+ + bisect--helper: move all subcommands into their own functions
196
+ + bisect--helper: remove unused options
197
+ (this branch is used by dd/git-bisect-builtin.)
198
+
199
+ Fix a regression in the bisect-helper which mistakenly treats
200
+ arguments to the command given to 'git bisect run' as arguments to
201
+ the helper.
202
+
203
+ Will cook in 'next'.
204
+ source: <cover.1667667058.git.congdanhqx@gmail.com>
205
+
206
+
207
+* dd/git-bisect-builtin (2022-11-07) 14 commits
208
+ - Turn `git bisect` into a full built-in
209
+ - bisect--helper: log: allow arbitrary number of arguments
210
+ - bisect--helper: remove subcommand state
211
+ - bisect--helper: make `state` optional
212
+ - bisect--helper: emit usage for "git bisect"
213
+ - bisect test: test exit codes on bad usage
214
+ - bisect--helper: pretend we're real bisect when report error
215
+ - bisect--helper: remove unused arguments from do_bisect_run
216
+ - bisect run: keep some of the post-v2.30.0 output
217
+ - bisect: fix output regressions in v2.30.0
218
+ - bisect--helper: pass arg[cv] down to do_bisect_run
219
+ - bisect: refactor bisect_run() to match CodingGuidelines
220
+ - bisect tests: test for v2.30.0 "bisect run" regressions
221
+ - Merge branch 'dd/bisect-helper-subcommand' into dd/git-bisect-builtin
222
+ (this branch uses dd/bisect-helper-subcommand.)
223
+
224
+ Expecting a (combined) reroll???
225
+ source: <cover-00.13-00000000000-20221104T132117Z-avarab@gmail.com>
226
+
227
+* ds/packed-refs-v2 (2022-11-07) 30 commits
228
+ - refs: skip hashing when writing packed-refs v2
229
+ - p1401: create performance test for ref operations
230
+ - ci: run GIT_TEST_PACKED_REFS_VERSION=2 in some builds
231
+ - t*: skip packed-refs v2 over http tests
232
+ - t3210: require packed-refs v1 for some tests
233
+ - t5502: add PACKED_REFS_V1 prerequisite
234
+ - t5312: allow packed-refs v2 format
235
+ - t1409: test with packed-refs v2
236
+ - packed-backend: create GIT_TEST_PACKED_REFS_VERSION
237
+ - packed-refs: write prefix chunks
238
+ - packed-refs: read optional prefix chunks
239
+ - packed-refs: read file format v2
240
+ - packed-refs: write file format version 2
241
+ - packed-backend: create shell of v2 writes
242
+ - config: add config values for packed-refs v2
243
+ - packed-backend: create abstraction for writing refs
244
+ - packed-backend: extract iterator/updates merge
245
+ - packed-backend: extract add_write_error()
246
+ - refs: extract packfile format to new file
247
+ - chunk-format: parse trailing table of contents
248
+ - chunk-format: allow trailing table of contents
249
+ - chunk-format: store chunk offset during write
250
+ - chunk-format: document trailing table of contents
251
+ - chunk-format: number of chunks is optional
252
+ - refs: allow loose files without packed-refs
253
+ - repository: wire ref extensions to ref backends
254
+ - config: fix multi-level bulleted list
255
+ - extensions: add refFormat extension
256
+ - read-cache: add index.computeHash config option
257
+ - hashfile: allow skipping the hash function
258
+
259
+ Waiting for review.
260
+ source: <pull.1408.git.1667846164.gitgitgadget@gmail.com>
261
+
262
+
263
+* es/chainlint-output (2022-11-08) 4 commits
264
+ - chainlint: annotate original test definition rather than token stream
265
+ - chainlint: latch start/end position of each token
266
+ - chainlint: tighten accuracy when consuming input stream
267
+ - chainlint: add explanatory comments
268
+
269
+ Teach chainlint.pl to annotate the original test definition instead
270
+ of the token stream.
271
+
272
+ Will merge to 'next'?
273
+ source: <pull.1375.git.git.1667934510.gitgitgadget@gmail.com>
274
+
275
+
276
+* ja/worktree-orphan (2022-11-04) 2 commits
277
+ - worktree add: add --orphan flag
278
+ - worktree add: Include -B in usage docs
279
+
280
+ 'git worktree add' learned how to create a worktree based on an
281
+ orphaned branch with `--orphan`.
282
+
283
+ source: <20221104213401.17393-1-jacobabel@nullpo.dev>
284
146
- The pack-bitmap machinery is taught to log the paths of redundant
147
- bitmap(s) to trace2 instead of stderr.
285
+
286
+* js/ci-set-output (2022-11-08) 1 commit
287
+ (merged to 'next' on 2022-11-08 at 553062428c)
288
+ + ci: use a newer `github-script` version
289
+
290
+ Update the actions/github-script dependency in CI to avoid a
291
+ deprecation warning.
292
+
293
+ Will merge to 'master'.
294
+ source: <pull.1387.git.1667902408921.gitgitgadget@gmail.com>
295
+
296
+
297
+* js/remove-stale-scalar-repos (2022-11-07) 1 commit
298
+ (merged to 'next' on 2022-11-08 at 6d598a3b80)
299
+ + scalar reconfigure -a: remove stale `scalar.repo` entries
300
+
301
+ 'scalar reconfigure -a' is taught to automatically remove
302
+ scalar.repo entires which no longer exist.
303
+
304
+ Will cook in 'next'.
305
+ source: <pull.1407.git.1667845501422.gitgitgadget@gmail.com>
306
+
307
+
308
+* jt/submodule-on-demand (2022-11-07) 1 commit
309
+ - submodule: explicitly specify on-demand upon push
310
+
311
+ Push all submodules recursively with
312
+ '--recurse-submodules=on-demand'.
313
+
314
+ Waiting for review.
315
+ source: <20221108002553.3836987-1-jonathantanmy@google.com>
316
+
317
+
318
+* pw/rebase-no-reflog-action (2022-11-04) 2 commits
319
+ - rebase: stop exporting GIT_REFLOG_ACTION
320
+ - sequencer: stop exporting GIT_REFLOG_ACTION
321
+ (this branch is used by ab/various-leak-fixes.)
322
+
323
+ Avoid setting GIT_REFLOG_ACTION to improve readability of the
324
+ sequencer internals.
325
+
326
+ Expecting a (final?) reroll.
327
+ source: <pull.1405.git.1667575142.gitgitgadget@gmail.com>
328
+
329
+
330
+* rp/maintenance-qol (2022-11-08) 2 commits
331
+ (merged to 'next' on 2022-11-08 at 076428c430)
332
+ + maintenance: add option to register in a specific config
333
+ + for-each-repo: interpolate repo path arguments
334
+
335
+ 'git maintenance register' is taught to write configuration to an
336
+ arbitrary path, and 'git for-each-repo' is taught to expand tilde
337
+ characters in paths.
338
+
339
+ Will cook in 'next'.
340
+ source: <20221108194930.25805-1-ronan@rjp.ie>
341
+
342
+
343
+* sa/cat-file-mailmap--batch-check (2022-10-30) 2 commits
344
+ - cat-file: add mailmap support to --batch-check option
345
+ - cat-file: add mailmap support to -s option
346
+
347
+ 'cat-file' gains mailmap support for its '--batch-check' and '-s'
348
+ options.
349
+
350
+* sz/macos-fsmonitor-symlinks (2022-11-08) 1 commit
351
+ - fsmonitor--daemon: on macOS support symlink
352
+
353
+ Fix an issue where core.fsmonitor on macOS would not notice created
354
+ or modified symbolic links.
355
+
356
+ Waiting for review.
357
+ source: <pull.1406.git.1667885119570.gitgitgadget@gmail.com>
358
+
359
+
360
+* tb/ci-concurrency (2022-11-08) 1 commit
361
+ - ci: avoid unnecessary builds
362
+
363
+ Avoid unnecessary builds in CI, with settings configured in
364
+ ci-config.
365
+
366
+ Waiting for review.
367
+ source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
368
+
369
+
370
+* tl/notes--blankline (2022-11-07) 3 commits
371
+ - notes.c: drop unreachable code in "append_edit()"
372
+ - notes.c: fixed tip when target and append note are both empty
373
+ - notes.c: introduce "--blank-line" option
374
+
375
+ 'git notes append' was taught '--[no-]blank-line' to conditionally
376
+ add a LF between a new and existing note.
377
378
Expecting a reroll.
150
- source: <87a494e5ac0cc992689944ab13600d097c51e54a.1667393419.git.dyroneteng@gmail.com>
379
+ source: <cover.1667828335.git.dyroneteng@gmail.com>
380
+
381
+
382
+* vd/update-refs-delete (2022-11-07) 1 commit
383
+ (merged to 'next' on 2022-11-08 at 2866156953)
384
+ + rebase --update-refs: avoid unintended ref deletion
385
+
386
+ Will cook in 'next'.
387
+ source: <20221107174752.91186-1-vdye@github.com>
388
389
--------------------------------------------------
390
[Stalled]
391
155
-* cw/submodule-status-in-parallel (2022-10-20) 7 commits
156
- . diff-lib: parallelize run_diff_files for submodules
157
- . diff-lib: refactor match_stat_with_submodule
158
- . submodule: move status parsing into function
159
- . submodule: strbuf variable rename
160
- . run-command: add hide_output to run_processes_parallel_opts
161
- . run-command: add pipe_output_fn to run_processes_parallel_opts
162
- . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
392
+* cw/submodule-status-in-parallel (2022-11-08) 6 commits
393
+ - diff-lib: parallelize run_diff_files for submodules
394
+ - diff-lib: refactor match_stat_with_submodule
395
+ - submodule: move status parsing into function
396
+ - submodule: strbuf variable rename
397
+ - run-command: add duplicate_output_fn to run_processes_parallel_opts
398
+ - Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
399
400
Allow the internal "diff-files" engine to run "how has this
401
submodule changed?" in parallel to speed up "git status".
402
167
- Breaks winVS test?
168
- cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092>
169
- source: <20221011232604.839941-1-calvinwan@google.com>
403
+ Waiting for review.
404
+ source: <20221020232532.1128326-1-calvinwan@google.com>
405
406
407
* js/bisect-in-c (2022-08-30) 17 commits
@@ -275,24 +510,104 @@ for convenience (replace "htmldocs" with "manpages" for the manual
510
--------------------------------------------------
511
[Cooking]
512
278
-* ab/cmake-nix-and-ci (2022-11-02) 12 commits
279
- - CI: add a "linux-cmake-test" to run cmake & ctest on linux
280
- - cmake: copy over git-p4.py for t983[56] perforce test
281
- - cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
282
- - Makefile + cmake: use environment, not GIT-BUILD-DIR
283
- - test-lib.sh: support a "GIT_TEST_BUILD_DIR"
284
- - cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
285
- - cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
286
- - cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
287
- - cmake: don't copy chainlint.pl to build directory
288
- - cmake: update instructions for portable CMakeLists.txt
289
- - cmake: don't "mkdir -p" and "cd" in build instructions
290
- - cmake: increase test timeout on Windows only
513
+* ab/submodule-helper-prep-only (2022-11-08) 9 commits
514
+ (merged to 'next' on 2022-11-08 at c0c4f4d1c3)
515
+ + submodule--helper: use OPT_SUBCOMMAND() API
516
+ + submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
517
+ + submodule--helper: remove --prefix from "absorbgitdirs"
518
+ + submodule API & "absorbgitdirs": remove "----recursive" option
519
+ + submodule.c: refactor recursive block out of absorb function
520
+ + submodule tests: test for a "foreach" blind-spot
521
+ + submodule--helper: fix a memory leak in "status"
522
+ + submodule tests: add tests for top-level flag output
523
+ + submodule--helper: move "config" to a test-tool
524
292
- Fix assorted issues with CTest on *nix machines.
525
+ Preparation to remove git-submodule.sh and replace it with a builtin.
526
+
527
+ Will cook in 'next'.
528
+ source: <cover-v2-0.9-00000000000-20221108T140501Z-avarab@gmail.com>
529
+
530
+
531
+* ds/bundle-uri-4 (2022-10-31) 9 commits
532
+ - clone: unbundle the advertised bundles
533
+ - bundle-uri: download bundles from an advertised list
534
+ - bundle-uri: allow relative URLs in bundle lists
535
+ - strbuf: reintroduce strbuf_parent_directory()
536
+ - bundle-uri client: add boolean transfer.bundleURI setting
537
+ - bundle-uri: serve bundle.* keys from config
538
+ - bundle-uri client: add helper for testing server
539
+ - bundle-uri client: add minimal NOOP client
540
+ - protocol v2: add server-side "bundle-uri" skeleton
541
+
542
+ Bundle URIs part 4.
543
544
Waiting for review.
295
- source: <cover-v3-00.12-00000000000-20221101T225022Z-avarab@gmail.com>
545
+ source: <pull.1400.git.1667264854.gitgitgadget@gmail.com>
546
+
547
+
548
+* sg/plug-line-log-leaks (2022-11-02) 3 commits
549
+ - diff.c: use diff_free_queue()
550
+ - line-log: free the diff queues' arrays when processing merge commits
551
+ - line-log: free diff queue when processing non-merge commits
552
+
553
+ A handful of leaks in the line-log machinery have been plugged.
554
+
555
+ Expecting a reroll.
556
+ source: <20221102220142.574890-1-szeder.dev@gmail.com>
557
+
558
+
559
+* tb/branch-delete-detached (2022-11-01) 1 commit
560
+ - branch: gracefully handle '-d' on detached HEAD
561
+
562
+ 'git branch -d' is taught to ignore failures to resolve HEAD when
563
+ detached.
564
+
565
+ Expecting a reroll.
566
+ source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com>
567
+
568
+
569
+* tb/howto-maintain-git-fixes (2022-10-31) 2 commits
570
+ - Documentation: build redo-seen.sh from jch..seen
571
+ - Documentation: build redo-jch.sh from master..jch
572
+
573
+ A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
574
+
575
+ Will merge to 'next'.
576
+ source: <cover.1667260044.git.me@ttaylorr.com>
577
+
578
+
579
+* tl/pack-bitmap-absolute-paths (2022-11-04) 2 commits
580
+ - pack-bitmap.c: remove unnecessary "open_pack_index()" calls
581
+ - pack-bitmap.c: avoid exposing absolute paths
582
+
583
+ The pack-bitmap machinery is taught to log the paths of redundant
584
+ bitmap(s) to trace2 instead of stderr.
585
+
586
+ Expecting a (final?) reroll.
587
+ source: <cover.1667470481.git.dyroneteng@gmail.com>
588
+
589
+
590
+* ab/cmake-nix-and-ci (2022-11-04) 14 commits
591
+ (merged to 'next' on 2022-11-08 at 6ef4e93b36)
592
+ + CI: add a "linux-cmake-test" to run cmake & ctest on linux
593
+ + cmake: copy over git-p4.py for t983[56] perforce test
594
+ + cmake: only look for "sh" in "C:/Program Files" on Windows
595
+ + cmake: increase test timeout on Windows only
596
+ + cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
597
+ + Makefile + cmake: use environment, not GIT-BUILD-DIR
598
+ + test-lib.sh: support a "GIT_TEST_BUILD_DIR"
599
+ + cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
600
+ + cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
601
+ + cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
602
+ + cmake: don't copy chainlint.pl to build directory
603
+ + cmake: update instructions for portable CMakeLists.txt
604
+ + cmake: use "-S" and "-B" to specify source and build directories
605
+ + cmake: don't invoke msgfmt with --statistics
606
+
607
+ Fix assorted issues with CTest on *nix machines.
608
+
609
+ Will cook in 'next'.
610
+ source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com>
611
612
613
* ab/make-bin-wrappers (2022-10-31) 4 commits
@@ -320,32 +635,34 @@ for convenience (replace "htmldocs" with "manpages" for the manual
635
source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
636
637
323
-* do/modernize-t7001 (2022-10-31) 1 commit
324
- - t7001-mv.sh:modernizing test script using function
638
+* do/modernize-t7001 (2022-11-04) 1 commit
639
+ (merged to 'next' on 2022-11-08 at dfc9c80e73)
640
+ + t7001-mv.sh: modernizing test script using functions
641
642
Modernize test script to avoid "test -f" and friends.
643
328
- Will merge to 'next'.
329
- source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com>
644
+ Will merge to 'master'.
645
+ source: <pull.1372.v3.git.git.1667574352244.gitgitgadget@gmail.com>
646
647
332
-* kz/merge-tree-merge-base (2022-11-01) 2 commits
333
- - merge-tree.c: support --merge-base in conjunction with --stdin
648
+* kz/merge-tree-merge-base (2022-11-04) 2 commits
649
+ - merge-tree.c: allow specifying the merge-base when --stdin is passed
650
- merge-tree.c: add --merge-base=<commit> option
651
652
"merge-tree" learns a new `--merge-base` option.
653
654
Waiting for review.
339
- source: <pull.1397.v4.git.1667292904.gitgitgadget@gmail.com>
655
+ source: <pull.1397.v6.git.1667472621.gitgitgadget@gmail.com>
656
657
342
-* mh/password-can-be-pat (2022-11-02) 1 commit
343
- - Mention that password could be a personal access token.
658
+* mh/password-can-be-pat (2022-11-08) 1 commit
659
+ (merged to 'next' on 2022-11-08 at 3135ade2a6)
660
+ + Documentation/gitcredentials.txt: mention password alternatives
661
662
Documentation update to git-credential(1).
663
347
- Will merge to 'next'.
348
- source: <pull.1396.v2.git.1667385022103.gitgitgadget@gmail.com>
664
+ Will merge to 'master'.
665
+ source: <pull.1396.v3.git.1667912487608.gitgitgadget@gmail.com>
666
667
668
* po/pretty-hard-trunc (2022-11-02) 1 commit
@@ -357,25 +674,14 @@ for convenience (replace "htmldocs" with "manpages" for the manual
674
source: <20221102120853.2013-1-philipoakley@iee.email>
675
676
360
-* rr/long-status-advice (2022-10-31) 1 commit
677
+* rr/long-status-advice (2022-11-04) 1 commit
678
- status: long status advice adapted to recent capabilities
679
680
The advice message emitted by a slow "status" run is amended to
681
mention fsmonitor.
682
683
Waiting for reviewer feedback on the updated round.
367
- source: <pull.1384.v2.git.1667002005494.gitgitgadget@gmail.com>
368
-
369
-
370
-* rs/archive-filter-error-once (2022-10-30) 1 commit
371
- (merged to 'next' on 2022-11-03 at c2d1004d96)
372
- + archive-tar: report filter start error only once
373
-
374
- "git archive" mistakenly complained twice about a missing executable,
375
- which has been corrected.
376
-
377
- Will merge to 'master'.
378
- source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>
684
+ source: <pull.1384.v3.git.1667424467505.gitgitgadget@gmail.com>
685
686
687
* ab/config-multi-and-nonbool (2022-11-02) 9 commits
@@ -396,60 +702,33 @@ for convenience (replace "htmldocs" with "manpages" for the manual
702
source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
703
704
399
-* ab/sha-makefile-doc (2022-10-26) 9 commits
400
- - Makefile: discuss SHAttered in *_SHA{1,256} discussion
401
- - Makefile: document default SHA-1 backend on OSX
402
- - Makefile: document SHA-1 and SHA-256 default and selection order
403
- - Makefile: document default SHA-256 backend
404
- - Makefile: rephrase the discussion of *_SHA1 knobs
405
- - Makefile: create and use sections for "define" flag listing
406
- - Makefile: correct DC_SHA1 documentation
407
- - INSTALL: remove discussion of SHA-1 backends
408
- - Makefile: always (re)set DC_SHA1 on fallback
705
+* ab/sha-makefile-doc (2022-11-07) 10 commits
706
+ (merged to 'next' on 2022-11-08 at 6d3068d7cd)
707
+ + Makefile: discuss SHAttered in *_SHA{1,256} discussion
708
+ + Makefile: document default SHA-1 backend on OSX
709
+ + Makefile & test-tool: replace "DC_SHA1" variable with a "define"
710
+ + Makefile: document SHA-1 and SHA-256 default and selection order
711
+ + Makefile: document default SHA-256 backend
712
+ + Makefile: rephrase the discussion of *_SHA1 knobs
713
+ + Makefile: create and use sections for "define" flag listing
714
+ + Makefile: correct DC_SHA1 documentation
715
+ + INSTALL: remove discussion of SHA-1 backends
716
+ + Makefile: always (re)set DC_SHA1 on fallback
717
718
Makefile comments updates and reordering to clarify knobs used to
719
choose SHA implementations.
720
413
- Will merge to 'next'?
414
- source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com>
721
+ Will cook in 'next'.
722
+ source: <cover-v5-00.10-00000000000-20221107T211736Z-avarab@gmail.com>
723
724
417
-* rs/no-more-run-command-v (2022-10-30) 12 commits
418
- (merged to 'next' on 2022-11-03 at 27eb80811c)
419
- + replace and remove run_command_v_opt()
420
- + replace and remove run_command_v_opt_cd_env_tr2()
421
- + replace and remove run_command_v_opt_tr2()
422
- + replace and remove run_command_v_opt_cd_env()
423
- + use child_process members "args" and "env" directly
424
- + use child_process member "args" instead of string array variable
425
- + sequencer: simplify building argument list in do_exec()
426
- + bisect--helper: factor out do_bisect_run()
427
- + bisect: simplify building "checkout" argument list
428
- + am: simplify building "show" argument list
429
- + run-command: fix return value comment
430
- + merge: remove always-the-same "verbose" arguments
431
-
432
- Simplify the run-command API.
433
-
434
- Will merge to 'master'.
435
- source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de>
436
-
437
-
438
-* tb/howto-using-redo-script (2022-10-26) 1 commit
439
- (merged to 'next' on 2022-11-03 at 521600fd56)
440
- + Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
441
- (this branch is used by tb/howto-maintain-git-fixes.)
442
-
443
- Doc update.
444
-
445
- Will merge to 'master'.
446
- source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
447
-
448
-
449
-* ps/receive-use-only-advertised (2022-10-28) 3 commits
450
- - SQUASH - leakfix
451
- - receive-pack: use advertised reference tips to inform connectivity check
452
- - connected: allow supplying different view of reachable objects
725
+* ps/receive-use-only-advertised (2022-11-08) 6 commits
726
+ - receive-pack: only use visible refs for connectivity check
727
+ - rev-parse: add `--exclude-hidden=` option
728
+ - revision: add new parameter to exclude hidden refs
729
+ - revision: introduce struct to handle exclusions
730
+ - revision: move together exclusion-related functions
731
+ - refs: get rid of global list of hidden refs
732
733
"git receive-pack" used to use all the local refs as the boundary
734
for checking connectivity of the data "git push" sent, but now it
@@ -459,21 +738,10 @@ for convenience (replace "htmldocs" with "manpages" for the manual
738
prove they have all objects that are necessary to complete the
739
history on top of only the history available to them.
740
462
- Expecting a reroll.
741
+ Expecting a (final?) reroll.
742
cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
743
cf. <xmqqr0yrizqm.fsf@gitster.g>
465
- source: <cover.1666967670.git.ps@pks.im>
466
-
467
-
468
-* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
469
- (merged to 'next' on 2022-11-03 at 32bfd99ffd)
470
- + adjust_shared_perm(): leave g+s alone when the group does not matter
471
-
472
- The adjust_shared_perm() helper function learned to refrain from
473
- setting the "g+s" bit on directories when it is not necessary.
474
-
475
- Will merge to 'master'.
476
- source: <xmqqr0yrhco6.fsf@gitster.g>
744
+ source: <cover.1667901510.git.ps@pks.im>
745
746
747
* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
@@ -493,18 +761,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
761
source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
762
763
496
-* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
497
- (merged to 'next' on 2022-11-03 at 4079e1b06b)
498
- + config: let feature.experimental imply gc.cruftPacks=true
499
- + gc: add tests for --cruft and friends
500
-
501
- Enable gc.cruftpacks by default for those who opt into
502
- feature.experimental setting.
503
-
504
- Will merge to 'master'.
505
- source: <cover.1666819953.git.me@ttaylorr.com>
506
-
507
-
764
* pw/config-int-parse-fixes (2022-10-22) 3 commits
765
. git_parse_signed(): avoid integer overflow
766
. config: require at least one digit when parsing numbers
@@ -527,21 +783,22 @@ for convenience (replace "htmldocs" with "manpages" for the manual
783
784
785
* tb/repack-expire-to (2022-10-24) 4 commits
530
- . builtin/repack.c: implement `--expire-to` for storing pruned objects
531
- . builtin/repack.c: write cruft packs to arbitrary locations
532
- . builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
533
- . builtin/repack.c: pass "out" to `prepare_pack_objects`
786
+ (merged to 'next' on 2022-11-08 at 496ce3c62d)
787
+ + builtin/repack.c: implement `--expire-to` for storing pruned objects
788
+ + builtin/repack.c: write cruft packs to arbitrary locations
789
+ + builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
790
+ + builtin/repack.c: pass "out" to `prepare_pack_objects`
791
792
"git repack" learns to send cruft objects out of the way into
793
packfiles outside the repository.
794
538
- Waiting for review.
795
+ Will cook in 'next'.
796
source: <cover.1666636974.git.me@ttaylorr.com>
797
798
799
* cc/filtered-repack (2022-10-25) 2 commits
543
- . repack: add --filter=<filter-spec> option
544
- . pack-objects: allow --filter without --stdout
800
+ - repack: add --filter=<filter-spec> option
801
+ - pack-objects: allow --filter without --stdout
802
803
"git repack" learns to discard objects that ought to be retrievable
804
again from the promissor remote.
@@ -550,29 +807,16 @@ for convenience (replace "htmldocs" with "manpages" for the manual
807
source: <20221025122856.20204-1-christian.couder@gmail.com>
808
809
553
-* al/trace2-clearing-skip-worktree (2022-10-31) 2 commits
554
- - SQUASH???
555
- - index: add trace2 region for clear skip worktree
810
+* al/trace2-clearing-skip-worktree (2022-11-04) 2 commits
811
+ (merged to 'next' on 2022-11-08 at 567aeb8d83)
812
+ + index: raise a bug if the index is materialised more than once
813
+ + index: add trace2 region for clear skip worktree
814
815
Add trace2 counters to the region to clear skip worktree bits in a
816
sparse checkout.
817
560
- Expecting a reroll?
561
- source: <pull.1368.v3.git.git.1667177791591.gitgitgadget@gmail.com>
562
-
563
-
564
-* po/glossary-around-traversal (2022-10-30) 4 commits
565
- (merged to 'next' on 2022-11-03 at 58b659f92b)
566
- + glossary: add reachability bitmap description
567
- + glossary: add "commit graph" description
568
- + doc: use 'object database' not ODB or abbreviation
569
- + doc: use "commit-graph" hyphenation consistently
570
-
571
- The glossary entries for "commit-graph file" and "reachability
572
- bitmap" have been added.
573
-
818
Will merge to 'master'.
575
- source: <20221029164112.2097-1-philipoakley@iee.email>
819
+ source: <pull.1368.v4.git.git.1667516701.gitgitgadget@gmail.com>
820
821
822
* mc/credential-helper-auth-headers (2022-11-02) 11 commits
@@ -617,13 +861,14 @@ for convenience (replace "htmldocs" with "manpages" for the manual
861
source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
862
863
620
-* en/sparse-checkout-design (2022-10-08) 1 commit
621
- . sparse-checkout.txt: new document with sparse-checkout directions
864
+* en/sparse-checkout-design (2022-11-07) 1 commit
865
+ (merged to 'next' on 2022-11-08 at 42e164b490)
866
+ + sparse-checkout.txt: new document with sparse-checkout directions
867
868
Design doc.
869
870
Needs review.
626
- source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>
871
+ source: <pull.1367.v4.git.1667714666810.gitgitgadget@gmail.com>
872
873
874
* pw/test-todo (2022-10-06) 3 commits
@@ -638,22 +883,23 @@ for convenience (replace "htmldocs" with "manpages" for the manual
883
884
885
* ab/coccicheck-incremental (2022-11-02) 13 commits
641
- - spatchcache: add a ccache-alike for "spatch"
642
- - cocci: run against a generated ALL.cocci
643
- - cocci rules: remove <id>'s from rules that don't need them
644
- - Makefile: copy contrib/coccinelle/*.cocci to build/
645
- - cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
646
- - cocci: make "coccicheck" rule incremental
647
- - cocci: split off "--all-includes" from SPATCH_FLAGS
648
- - cocci: split off include-less "tests" from SPATCH_FLAGS
649
- - Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
650
- - Makefile: have "coccicheck" re-run if flags change
651
- - Makefile: add ability to TAB-complete cocci *.patch rules
652
- - cocci rules: remove unused "F" metavariable from pending rule
653
- - Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
886
+ (merged to 'next' on 2022-11-08 at 0f3c55d4c2)
887
+ + spatchcache: add a ccache-alike for "spatch"
888
+ + cocci: run against a generated ALL.cocci
889
+ + cocci rules: remove <id>'s from rules that don't need them
890
+ + Makefile: copy contrib/coccinelle/*.cocci to build/
891
+ + cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
892
+ + cocci: make "coccicheck" rule incremental
893
+ + cocci: split off "--all-includes" from SPATCH_FLAGS
894
+ + cocci: split off include-less "tests" from SPATCH_FLAGS
895
+ + Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
896
+ + Makefile: have "coccicheck" re-run if flags change
897
+ + Makefile: add ability to TAB-complete cocci *.patch rules
898
+ + cocci rules: remove unused "F" metavariable from pending rule
899
+ + Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
900
901
"make coccicheck" is time consuming. It has been made to run more
902
incrementally.
903
658
- Will merge to 'next'?
904
+ Will cook in 'next'.
905
source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com>