What's cooking (2022/11 #1)
Taylor Blau committed
Nov 3, 2022 at 21:04 UTC
5a2ca43ef7e17617fcb7127ef0ecfbe333dd0091
1 file changed
+250
-391
whats-cooking.txt
+250
-391
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2022, #09; Mon, 31)
3
-X-master-at: c03801e19cb8ab36e9c0d17ff3d5e0c3b0f24193
4
-X-next-at: 9c842762fa910556468148797cfe94af2a5abbb2
2
+Subject: What's cooking in git.git (Nov 2022, #01; Thu, 3)
3
+X-master-at: 3b08839926fcc7cc48cf4c759737c1a71af430c1
4
+X-next-at: 58b659f92b25267976ae36dbe1e7cb129f8f5311
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2022, #09; Mon, 31)
7
+What's cooking in git.git (Nov 2022, #01; Thu, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,13 +14,9 @@ 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
-This is the first pushout from the interim maintainer. Topics which
18
-were marked as ready for 'master' have been merged, and 'next' is now
19
-empty. A number of topics have been marked for 'next' which will start
20
-graduating in the next round.
21
-
22
-Please point out any glitches you see along the way. If a topic you
23
-sent doesn't appear here, please nudge me or resend it.
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.
20
21
Copies of the source code to Git live in many repositories, and the
22
following is a list of the ones I push into or their mirrors. Some
@@ -54,355 +50,104 @@ for convenience (replace "htmldocs" with "manpages" for the manual
50
51
https://www.kernel.org/pub/software/scm/git/
52
57
---------------------------------------------------
58
-[Graduated to 'master']
59
-
60
-* ds/bundle-uri-3 (2022-10-12) 13 commits
61
- (merged to 'next' on 2022-10-28 at 9d9092b4cc)
62
- + bundle-uri: suppress stderr from remote-https
63
- + bundle-uri: quiet failed unbundlings
64
- + bundle: add flags to verify_bundle()
65
- + bundle-uri: fetch a list of bundles
66
- + bundle: properly clear all revision flags
67
- + bundle-uri: limit recursion depth for bundle lists
68
- + bundle-uri: parse bundle list in config format
69
- + bundle-uri: unit test "key=value" parsing
70
- + bundle-uri: create "key=value" line parsing
71
- + bundle-uri: create base key-value pair parsing
72
- + bundle-uri: create bundle_list struct and helpers
73
- + bundle-uri: use plain string in find_temp_filename()
74
- + Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3
75
-
76
- Define the logical elements of a "bundle list", data structure to
77
- store them in-core, format to transfer them, and code to parse
78
- them.
79
- source: <pull.1333.v5.git.1665579160.gitgitgadget@gmail.com>
80
-
81
-
82
-* en/merge-tree-sequence (2022-10-22) 2 commits
83
- (merged to 'next' on 2022-10-28 at 31459cd5a8)
84
- + merge-tree: support multiple batched merges with --stdin
85
- + merge-tree: update documentation for differences in -z output
86
-
87
- "git merge-tree --stdin" is a new way to request a series of merges
88
- and report the merge results.
89
- source: <pull.1361.git.1666488485.gitgitgadget@gmail.com>
90
-
91
-
92
-* en/ort-dir-rename-and-symlink-fix (2022-10-22) 1 commit
93
- (merged to 'next' on 2022-10-27 at 56f1e5222d)
94
- + merge-ort: fix bug with dir rename vs change dir to symlink
95
-
96
- Merging a branch with directory renames into a branch that changes
97
- the directory to a symlink was mishandled by the ort merge
98
- strategy, which has been corrected.
99
- source: <pull.1391.git.1666465450590.gitgitgadget@gmail.com>
100
-
101
-
102
-* jc/doc-fsck-msgids (2022-10-25) 4 commits
103
- (merged to 'next' on 2022-10-28 at 3c00edabf8)
104
- + Documentation: add lint-fsck-msgids
105
- + fsck: document msg-id
106
- + fsck: remove the unused MISSING_TREE_OBJECT
107
- + fsck: remove the unused BAD_TAG_OBJECT
108
-
109
- Add documentation for message IDs in fsck error messages.
110
- source: <20221025224224.2352979-1-gitster@pobox.com>
111
-
112
-
113
-* jh/trace2-timers-and-counters (2022-10-24) 8 commits
114
- (merged to 'next' on 2022-10-26 at e4933e2658)
115
- + trace2: add global counter mechanism
116
- + trace2: add stopwatch timers
117
- + trace2: convert ctx.thread_name from strbuf to pointer
118
- + trace2: improve thread-name documentation in the thread-context
119
- + trace2: rename the thread_name argument to trace2_thread_start
120
- + api-trace2.txt: elminate section describing the public trace2 API
121
- + tr2tls: clarify TLS terminology
122
- + trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
123
-
124
- Two new facilities, "timer" and "counter", are introduced to the
125
- trace2 API.
126
- source: <pull.1373.v4.git.1666618868.gitgitgadget@gmail.com>
127
-
128
-
129
-* jk/repack-tempfile-cleanup (2022-10-23) 6 commits
130
- (merged to 'next' on 2022-10-26 at e706eb120c)
131
- + t7700: annotate cruft-pack failure with ok=sigpipe
132
- + repack: drop remove_temporary_files()
133
- + repack: use tempfiles for signal cleanup
134
- + repack: expand error message for missing pack files
135
- + repack: populate extension bits incrementally
136
- + repack: convert "names" util bitfield to array
137
-
138
- The way "git repack" creared temporary files when it received a
139
- signal was prone to deadlocking, which has been corrected.
140
- source: <Y1M3fVnixJHvKiSg@coredump.intra.peff.net>
141
-
142
-
143
-* jr/embargoed-releases-doc (2022-10-24) 1 commit
144
- (merged to 'next' on 2022-10-27 at c000502eaa)
145
- + embargoed releases: also describe the git-security list and the process
146
-
147
- The role the security mailing list plays in an embargoed release
148
- has been documented.
149
- source: <pull.1345.v4.git.1666649239302.gitgitgadget@gmail.com>
150
-
151
-
152
-* jt/skipping-negotiator-wo-recursion (2022-10-25) 1 commit
153
- (merged to 'next' on 2022-10-28 at 4a2588ab9e)
154
- + negotiator/skipping: avoid stack overflow
155
-
156
- Rewrite a deep recursion in the skipping negotiator to use a loop
157
- with on-heap prio queue to avoid stack wastage.
158
- source: <20221025232934.1504445-1-jonathantanmy@google.com>
159
-
160
-
161
-* jz/patch-id (2022-10-24) 6 commits
162
- (merged to 'next' on 2022-10-24 at 1ac3b46fbe)
163
- + builtin: patch-id: remove unused diff-tree prefix
164
- + builtin: patch-id: add --verbatim as a command mode
165
- + patch-id: fix patch-id for mode changes
166
- + builtin: patch-id: fix patch-id with binary diffs
167
- + patch-id: use stable patch-id for rebases
168
- + patch-id: fix stable patch id for binary / header-only
169
-
170
- A new "--include-whitespace" option is added to "git patch-id", and
171
- existing bugs in the internal patch-id logic that did not match
172
- what "git patch-id" produces have been corrected.
173
- source: <pull.1359.v5.git.1666642064.gitgitgadget@gmail.com>
174
-
175
-
176
-* pb/subtree-split-and-merge-after-squashing-tag-fix (2022-10-21) 9 commits
177
- (merged to 'next' on 2022-10-27 at 4f2134dd87)
178
- + subtree: fix split after annotated tag was squashed merged
179
- + subtree: fix squash merging after annotated tag was squashed merged
180
- + subtree: process 'git-subtree-split' trailer in separate function
181
- + subtree: use named variables instead of "$@" in cmd_pull
182
- + subtree: define a variable before its first use in 'find_latest_squash'
183
- + subtree: prefix die messages with 'fatal'
184
- + subtree: add 'die_incompatible_opt' function to reduce duplication
185
- + subtree: use 'git rev-parse --verify [--quiet]' for better error messages
186
- + test-lib-functions: mark 'test_commit' variables as 'local'
187
-
188
- A bugfix to "git subtree" in its split and merge features.
189
- source: <pull.1390.git.1666365219.gitgitgadget@gmail.com>
190
-
191
-
192
-* pw/rebase-keep-base-fixes (2022-10-17) 8 commits
193
- (merged to 'next' on 2022-10-27 at 802359afac)
194
- + rebase --keep-base: imply --no-fork-point
195
- + rebase --keep-base: imply --reapply-cherry-picks
196
- + rebase: factor out branch_base calculation
197
- + rebase: rename merge_base to branch_base
198
- + rebase: store orig_head as a commit
199
- + rebase: be stricter when reading state files containing oids
200
- + t3416: set $EDITOR in subshell
201
- + t3416: tighten two tests
202
- (this branch is used by pw/rebase-reflog-fixes.)
203
-
204
- "git rebase --keep-base" used to discard the commits that are
205
- already cherry-picked to the upstream, even when "keep-base" meant
206
- that the base, on top of which the history is being rebuilt, does
207
- not yet include these cherry-picked commits. The --keep-base
208
- option now implies --reapply-cherry-picks and --no-fork-point
209
- options.
210
- source: <pull.1323.v4.git.1666012665.gitgitgadget@gmail.com>
211
-
212
-
213
-* pw/rebase-reflog-fixes (2022-10-17) 9 commits
214
- (merged to 'next' on 2022-10-27 at 60738821ef)
215
- + rebase: cleanup action handling
216
- + rebase --abort: improve reflog message
217
- + rebase --apply: make reflog messages match rebase --merge
218
- + rebase --apply: respect GIT_REFLOG_ACTION
219
- + rebase --merge: fix reflog message after skipping
220
- + rebase --merge: fix reflog when continuing
221
- + t3406: rework rebase reflog tests
222
- + rebase --apply: remove duplicated code
223
- + Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
224
- (this branch uses pw/rebase-keep-base-fixes.)
225
-
226
- Fix some bugs in the reflog messages when rebasing and changes the
227
- reflog messages of "rebase --apply" to match "rebase --merge" with
228
- the aim of making the reflog easier to parse.
229
- source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
230
-
231
-
232
-* rj/branch-copy-rename-error-codepath-cleanup (2022-10-26) 1 commit
233
- (merged to 'next' on 2022-10-27 at f01a4ff619)
234
- + branch: error copying or renaming a detached HEAD
235
-
236
- Code simplification.
237
- source: <0ac8cd48-08d7-9bdd-b074-c8d5ded522f6@gmail.com>
238
-
239
-
240
-* rj/branch-do-not-exit-with-minus-one-status (2022-10-26) 1 commit
241
- (merged to 'next' on 2022-10-27 at 061f63d4e2)
242
- + branch: error code with --edit-description
243
-
244
- "git branch --edit-description" can exit with status -1 which is
245
- not a good practice; it learned to use 1 as everybody else instead.
246
- source: <b0f96b35-4e69-a889-bcdf-e0b40b89384f@gmail.com>
247
-
248
-
249
-* rs/absorb-git-dir-simplify (2022-10-23) 1 commit
250
- (merged to 'next' on 2022-10-26 at 3d23cfd399)
251
- + submodule: use strvec_pushf() for --super-prefix
252
-
253
- Code simplification by using strvec_pushf() instead of building an
254
- argument in a separate strbuf.
255
- source: <7a4e2fc6-3e01-5683-2be5-13b7e67c7fe5@web.de>
256
-
257
-
258
-* sd/doc-smtp-encryption (2022-10-12) 1 commit
259
- (merged to 'next' on 2022-10-26 at b984763a1b)
260
- + docs: git-send-email: difference between ssl and tls smtp-encryption
261
-
262
- Will merge to 'master'.
263
- source: <20221012150619.12877-1-sndanailov@wired4ever.net>
264
-
265
-
266
-* sg/stable-docdep (2022-10-21) 1 commit
267
- (merged to 'next' on 2022-10-26 at 68432e1b2c)
268
- + Documentation/build-docdep.perl: generate sorted output
269
-
270
- Make sure generated dependency file is stably sorted to help
271
- developers debugging their build issues.
272
- source: <20221021102950.539148-1-szeder.dev@gmail.com>
273
-
274
-
275
-* tb/cap-patch-at-1gb (2022-10-25) 1 commit
276
- (merged to 'next' on 2022-10-27 at f0b4f9c12a)
277
- + apply: reject patches larger than ~1 GiB
278
-
279
- "git apply" limits its input to a bit less than 1 GiB.
280
- source: <70f5763834dff373a5573a99ec4cdfa36cadf34c.1666722251.git.me@ttaylorr.com>
281
-
282
-
283
-* tb/midx-cleanup-fix (2022-10-25) 1 commit
284
- - midx.c: clear auxiliary MIDX files first
285
-
286
- The order in which multi-pack-index and its associated files are
287
- dropped has been tweaked to make it safer for concurrent users.
288
-
289
- Under discussion, but leaning to negative..
290
- cf. <143a588a-c98b-733b-2b23-34a87ca89431@github.com>
291
- source: <bf36093cd6d7ac83b16241b0199b3a8c904e6774.1666722316.git.me@ttaylorr.com>
292
-
293
-
294
-* tb/shortlog-group (2022-10-24) 7 commits
295
- (merged to 'next' on 2022-10-26 at 76e64a6036)
296
- + shortlog: implement `--group=committer` in terms of `--group=<format>`
297
- + shortlog: implement `--group=author` in terms of `--group=<format>`
298
- + shortlog: extract `shortlog_finish_setup()`
299
- + shortlog: support arbitrary commit format `--group`s
300
- + shortlog: extract `--group` fragment for translation
301
- + shortlog: make trailer insertion a noop when appropriate
302
- + shortlog: accept `--date`-related options
303
-
304
- "git shortlog" learned to group by the "format" string.
305
- source: <cover.1666637725.git.me@ttaylorr.com>
306
-
53
--------------------------------------------------
54
[New Topics]
55
310
-* ab/cmake-nix-and-ci (2022-10-30) 11 commits
311
- - CI: add a "linux-cmake-test" to run cmake & ctest on linux
312
- - cmake: copy over git-p4.py for t983[56] perforce test
313
- - cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
314
- - Makefile + cmake: use environment, not GIT-BUILD-DIR
315
- - test-lib.sh: support a "GIT_TEST_BUILD_DIR"
316
- - cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
317
- - cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
318
- - cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
319
- - cmake: don't copy chainlint.pl to build directory
320
- - cmake: update instructions for portable CMakeLists.txt
321
- - cmake: don't "mkdir -p" and "cd" in build instructions
322
-
323
- Fix assorted issues with CTest on *nix machines.
324
-
325
- Waiting for review.
326
- source: <cover-v2-00.11-00000000000-20221027T032622Z-avarab@gmail.com>
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
65
66
+ Preparation to remove git-submodule.sh and replace it with a builtin.
67
329
-* ab/make-bin-wrappers (2022-10-30) 3 commits
330
- - Makefile: simplify $(test_bindir_programs) rule by splitting it up
331
- - Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
332
- - Makefile: factor sed-powered '#!/bin/sh' munging into a variable
333
-
334
- Resolve issues with the bin-wrappers/% rules where "make
335
- bin-wrappers/git" would generate the script but not "git" itself.
336
-
337
- Waiting for review.
338
- source: <cover-v2-0.3-00000000000-20221026T143533Z-avarab@gmail.com>
68
+ Waiting for review?
69
+ source: <cover-0.8-00000000000-20221102T074148Z-avarab@gmail.com>
70
71
341
-* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
342
- - run-command tests: test stdout of run_command_parallel()
343
- - submodule tests: reset "trace.out" between "grep" invocations
344
- - hook tests: fix redirection logic error in 96e7225b310
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
82
346
- Various test updates.
83
+ Bundle URIs part 4.
84
348
- Waiting for review.
349
- source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
85
+ source: <pull.1400.git.1667264854.gitgitgadget@gmail.com>
86
87
352
-* do/modernize-t7001 (2022-10-31) 1 commit
353
- - t7001-mv.sh:modernizing test script using function
88
+* jk/ref-filter-parsing-bugs (2022-11-02) 2 commits
89
+ (merged to 'next' on 2022-11-03 at 92c1a50548)
90
+ + ref-filter: fix parsing of signatures with CRLF and no body
91
+ + ref-filter: fix parsing of signatures without blank lines
92
355
- Modernize test script to avoid "test -f" and friends.
93
+ Various tests exercising the transfer.credentialsInUrl configuration
94
+ are taught to avoid making requests which require resolving localhost
95
+ to reduce CI-flakiness.
96
357
- Will merge to 'next'.
358
- source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com>
97
+ Will merge to 'master'.
98
+ source: <Y2IeqOT5Ao1Qa0Zl@coredump.intra.peff.net>
99
100
361
-* kz/merge-tree-merge-base (2022-10-29) 1 commit
362
- - merge-tree.c: add --merge-base=<commit> option
101
+* ma/drop-redundant-diagnostic (2022-10-31) 1 commit
102
+ (merged to 'next' on 2022-11-03 at 196c5a337b)
103
+ + test-lib-functions: drop redundant diagnostic print
104
364
- "merge-tree" learns a new `--merge-base` option.
105
+ A redundant diagnostic message is dropped from test_path_is_missing().
106
366
- Waiting for review.
367
- source: <pull.1397.v3.git.1667014975042.gitgitgadget@gmail.com>
107
+ Will merge to 'master'.
108
+ source: <20221031180048.5766-1-martin.agren@gmail.com>
109
110
370
-* mh/password-can-be-pat (2022-10-30) 1 commit
371
- - Mention that password could be a personal access token.
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
115
373
- Documentation update to git-credential(1).
116
+ A handful of leaks in the line-log machinery have been plugged.
117
375
- Will merge to 'next'.
376
- source: <pull.1396.git.1666845947898.gitgitgadget@gmail.com>
118
+ Expecting a reroll.
119
+ source: <20221102220142.574890-1-szeder.dev@gmail.com>
120
121
379
-* po/pretty-hard-trunc (2022-10-30) 1 commit
380
- - pretty-formats: add hard truncation, without ellipsis, options
122
+* tb/branch-delete-detached (2022-11-01) 1 commit
123
+ - branch: gracefully handle '-d' on detached HEAD
124
382
- Add a new pretty format which truncates without ellipsis.
125
+ 'git branch -d' is taught to ignore failures to resolve HEAD when
126
+ detached.
127
384
- Missing test coverage.
385
- source: <20221030185614.3842-1-philipoakley@iee.email>
128
+ Expecting a reroll.
129
+ source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com>
130
131
388
-* rr/long-status-advice (2022-10-31) 1 commit
389
- - status: long status advice adapted to recent capabilities
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.)
136
391
- The advice message emitted by a slow "status" run is amended to
392
- mention fsmonitor.
137
+ A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
138
394
- Waiting for reviewer feedback on the updated round.
395
- source: <pull.1384.v2.git.1667002005494.gitgitgadget@gmail.com>
139
+ Will merge to 'next'.
140
+ source: <cover.1667260044.git.me@ttaylorr.com>
141
142
398
-* rs/archive-filter-error-once (2022-10-30) 1 commit
399
- - archive-tar: report filter start error only once
143
+* tl/pack-bitmap-absolute-paths (2022-11-02) 1 commit
144
+ - pack-bitmap.c: avoid exposing absolute paths
145
401
- "git archive" mistakenly complained twice about a missing executable,
402
- which has been corrected.
146
+ The pack-bitmap machinery is taught to log the paths of redundant
147
+ bitmap(s) to trace2 instead of stderr.
148
404
- Will merge to 'next'.
405
- source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>
149
+ Expecting a reroll.
150
+ source: <87a494e5ac0cc992689944ab13600d097c51e54a.1667393419.git.dyroneteng@gmail.com>
151
152
--------------------------------------------------
153
[Stalled]
@@ -530,23 +275,125 @@ for convenience (replace "htmldocs" with "manpages" for the manual
275
--------------------------------------------------
276
[Cooking]
277
533
-* ab/config-multi-and-nonbool (2022-10-27) 10 commits
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
291
+
292
+ Fix assorted issues with CTest on *nix machines.
293
+
294
+ Waiting for review.
295
+ source: <cover-v3-00.12-00000000000-20221101T225022Z-avarab@gmail.com>
296
+
297
+
298
+* ab/make-bin-wrappers (2022-10-31) 4 commits
299
+ - Makefile: simplify $(test_bindir_programs) rule by splitting it up
300
+ - Makefile: rename "test_bindir_programs" variable, pre-declare
301
+ - Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
302
+ - Makefile: factor sed-powered '#!/bin/sh' munging into a variable
303
+
304
+ Resolve issues with the bin-wrappers/% rules where "make
305
+ bin-wrappers/git" would generate the script but not "git" itself.
306
+
307
+ Waiting for review.
308
+ source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>
309
+
310
+
311
+* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
312
+ (merged to 'next' on 2022-11-03 at 0f01b25561)
313
+ + run-command tests: test stdout of run_command_parallel()
314
+ + submodule tests: reset "trace.out" between "grep" invocations
315
+ + hook tests: fix redirection logic error in 96e7225b310
316
+
317
+ Various test updates.
318
+
319
+ Waiting for review.
320
+ source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
321
+
322
+
323
+* do/modernize-t7001 (2022-10-31) 1 commit
324
+ - t7001-mv.sh:modernizing test script using function
325
+
326
+ Modernize test script to avoid "test -f" and friends.
327
+
328
+ Will merge to 'next'.
329
+ source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com>
330
+
331
+
332
+* kz/merge-tree-merge-base (2022-11-01) 2 commits
333
+ - merge-tree.c: support --merge-base in conjunction with --stdin
334
+ - merge-tree.c: add --merge-base=<commit> option
335
+
336
+ "merge-tree" learns a new `--merge-base` option.
337
+
338
+ Waiting for review.
339
+ source: <pull.1397.v4.git.1667292904.gitgitgadget@gmail.com>
340
+
341
+
342
+* mh/password-can-be-pat (2022-11-02) 1 commit
343
+ - Mention that password could be a personal access token.
344
+
345
+ Documentation update to git-credential(1).
346
+
347
+ Will merge to 'next'.
348
+ source: <pull.1396.v2.git.1667385022103.gitgitgadget@gmail.com>
349
+
350
+
351
+* po/pretty-hard-trunc (2022-11-02) 1 commit
352
+ - pretty-formats: add hard truncation, without ellipsis, options
353
+
354
+ Add a new pretty format which truncates without ellipsis.
355
+
356
+ Missing test coverage.
357
+ source: <20221102120853.2013-1-philipoakley@iee.email>
358
+
359
+
360
+* rr/long-status-advice (2022-10-31) 1 commit
361
+ - status: long status advice adapted to recent capabilities
362
+
363
+ The advice message emitted by a slow "status" run is amended to
364
+ mention fsmonitor.
365
+
366
+ 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>
379
+
380
+
381
+* ab/config-multi-and-nonbool (2022-11-02) 9 commits
382
- for-each-repo: with bad config, don't conflate <path> and <cmd>
383
- config API: add "string" version of *_value_multi(), fix segfaults
536
- - config tests: add "NULL" tests for *_get_value_multi()
537
- - config API: add and use "lookup_value" functions
538
- - builtin/gc.c: use "unsorted_string_list_has_string()" where appropriate
539
- - string-list API: make has_string() and list_lookup() "const"
540
- - string-list API: mark "struct_string_list" to "for_each_string_list" const
541
- - config API: mark *_multi() with RESULT_MUST_BE_USED
384
+ - config API users: test for *_get_value_multi() segfaults
385
- for-each-repo: error on bad --config
386
- config API: have *_multi() return an "int" and take a "dest"
387
+ - versioncmp.c: refactor config reading next commit
388
+ - config tests: add "NULL" tests for *_get_value_multi()
389
+ - config tests: cover blind spots in git_die_config() tests
390
+ - for-each-repo tests: test bad --config keys
391
392
A mixed bag of config API updates.
393
394
Expecting a reroll.
395
cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
549
- source: <cover-00.10-00000000000-20221026T151328Z-avarab@gmail.com>
396
+ source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
397
398
399
* ab/sha-makefile-doc (2022-10-26) 9 commits
@@ -568,31 +415,34 @@ for convenience (replace "htmldocs" with "manpages" for the manual
415
416
417
* rs/no-more-run-command-v (2022-10-30) 12 commits
571
- - replace and remove run_command_v_opt()
572
- - replace and remove run_command_v_opt_cd_env_tr2()
573
- - replace and remove run_command_v_opt_tr2()
574
- - replace and remove run_command_v_opt_cd_env()
575
- - use child_process members "args" and "env" directly
576
- - use child_process member "args" instead of string array variable
577
- - sequencer: simplify building argument list in do_exec()
578
- - bisect--helper: factor out do_bisect_run()
579
- - bisect: simplify building "checkout" argument list
580
- - am: simplify building "show" argument list
581
- - run-command: fix return value comment
582
- - merge: remove always-the-same "verbose" arguments
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
586
- Will merge to 'next'.
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
591
- - Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
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
595
- Will merge to 'next'.
445
+ Will merge to 'master'.
446
source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
447
448
@@ -616,12 +466,13 @@ for convenience (replace "htmldocs" with "manpages" for the manual
466
467
468
* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
619
- - adjust_shared_perm(): leave g+s alone when the group does not matter
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
624
- Will merge to 'next'.
475
+ Will merge to 'master'.
476
source: <xmqqr0yrhco6.fsf@gitster.g>
477
478
@@ -643,20 +494,21 @@ for convenience (replace "htmldocs" with "manpages" for the manual
494
495
496
* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
646
- - config: let feature.experimental imply gc.cruftPacks=true
647
- - gc: add tests for --cruft and friends
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
652
- Will merge to 'next'.
504
+ Will merge to 'master'.
505
source: <cover.1666819953.git.me@ttaylorr.com>
506
507
508
* pw/config-int-parse-fixes (2022-10-22) 3 commits
657
- - git_parse_signed(): avoid integer overflow
658
- - config: require at least one digit when parsing numbers
659
- - git_parse_unsigned: reject negative values
509
+ . git_parse_signed(): avoid integer overflow
510
+ . config: require at least one digit when parsing numbers
511
+ . git_parse_unsigned: reject negative values
512
513
Assorted fixes of parsing end-user input as integers.
514
@@ -666,7 +518,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
518
519
520
* sa/cat-file-mailmap (2022-10-21) 1 commit
669
- - doc/cat-file: allow --use-mailmap for --batch options
521
+ . doc/cat-file: allow --use-mailmap for --batch options
522
523
Doc updates.
524
@@ -675,10 +527,10 @@ for convenience (replace "htmldocs" with "manpages" for the manual
527
528
529
* tb/repack-expire-to (2022-10-24) 4 commits
678
- - builtin/repack.c: implement `--expire-to` for storing pruned objects
679
- - builtin/repack.c: write cruft packs to arbitrary locations
680
- - builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
681
- - builtin/repack.c: pass "out" to `prepare_pack_objects`
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`
534
535
"git repack" learns to send cruft objects out of the way into
536
packfiles outside the repository.
@@ -688,8 +540,8 @@ for convenience (replace "htmldocs" with "manpages" for the manual
540
541
542
* cc/filtered-repack (2022-10-25) 2 commits
691
- - repack: add --filter=<filter-spec> option
692
- - pack-objects: allow --filter without --stdout
543
+ . repack: add --filter=<filter-spec> option
544
+ . pack-objects: allow --filter without --stdout
545
546
"git repack" learns to discard objects that ought to be retrievable
547
again from the promissor remote.
@@ -698,7 +550,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
550
source: <20221025122856.20204-1-christian.couder@gmail.com>
551
552
701
-* al/trace2-clearing-skip-worktree (2022-10-28) 2 commits
553
+* al/trace2-clearing-skip-worktree (2022-10-31) 2 commits
554
- SQUASH???
555
- index: add trace2 region for clear skip worktree
556
@@ -706,24 +558,30 @@ for convenience (replace "htmldocs" with "manpages" for the manual
558
sparse checkout.
559
560
Expecting a reroll?
709
- source: <pull.1368.v2.git.git.1666917961644.gitgitgadget@gmail.com>
561
+ source: <pull.1368.v3.git.git.1667177791591.gitgitgadget@gmail.com>
562
563
564
* po/glossary-around-traversal (2022-10-30) 4 commits
713
- - glossary: add reachability bitmap description
714
- - glossary: add "commit graph" description
715
- - doc: use 'object database' not ODB or abbreviation
716
- - doc: use "commit-graph" hyphenation consistently
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
721
- Will merge to 'next'.
574
+ Will merge to 'master'.
575
source: <20221029164112.2097-1-philipoakley@iee.email>
576
577
725
-* mc/credential-helper-auth-headers (2022-10-21) 6 commits
726
- - t5556-http-auth: add test for HTTP auth hdr logic
578
+* mc/credential-helper-auth-headers (2022-11-02) 11 commits
579
+ - t5556: add HTTP authentication tests
580
+ - test-http-server: add simple authentication
581
+ - test-http-server: pass Git requests to http-backend
582
+ - test-http-server: add HTTP request parsing
583
+ - test-http-server: add HTTP error response function
584
+ - test-http-server: add stub HTTP server test helper
585
- http: set specific auth scheme depending on credential
586
- http: move proactive auth to first slot creation
587
- http: store all request headers on active_request_slot
@@ -733,20 +591,20 @@ for convenience (replace "htmldocs" with "manpages" for the manual
591
Extending credential helper protocol.
592
593
Needs review.
736
- source: <pull.1352.v2.git.1666372083.gitgitgadget@gmail.com>
594
+ source: <pull.1352.v3.git.1667426969.gitgitgadget@gmail.com>
595
596
597
* hl/archive-recursive (2022-10-19) 10 commits
740
- - fixup! archive: add tests for git archive --recurse-submodules
741
- - archive: add tests for git archive --recurse-submodules
742
- - archive: add --recurse-submodules to git-archive command
743
- - archive: remove global repository from archive_args
744
- - archive: pass repo objects to write_archive handlers
745
- - tree: add repository parameter to read_tree_fn_t
746
- - tree: handle submodule case for read_tree_at properly
747
- - tree: increase test coverage for tree.c
748
- - tree: update cases to use repo_ tree methods
749
- - tree: do not use the_repository for tree traversal methods.
598
+ . fixup! archive: add tests for git archive --recurse-submodules
599
+ . archive: add tests for git archive --recurse-submodules
600
+ . archive: add --recurse-submodules to git-archive command
601
+ . archive: remove global repository from archive_args
602
+ . archive: pass repo objects to write_archive handlers
603
+ . tree: add repository parameter to read_tree_fn_t
604
+ . tree: handle submodule case for read_tree_at properly
605
+ . tree: increase test coverage for tree.c
606
+ . tree: update cases to use repo_ tree methods
607
+ . tree: do not use the_repository for tree traversal methods.
608
609
"git archive" has been taught "--recurse-submodules" option to
610
create a tarball that includes contents from submodules.
@@ -760,7 +618,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
618
619
620
* en/sparse-checkout-design (2022-10-08) 1 commit
763
- - sparse-checkout.txt: new document with sparse-checkout directions
621
+ . sparse-checkout.txt: new document with sparse-checkout directions
622
623
Design doc.
624
@@ -769,9 +627,9 @@ for convenience (replace "htmldocs" with "manpages" for the manual
627
628
629
* pw/test-todo (2022-10-06) 3 commits
772
- - test_todo: allow [verbose] test as the command
773
- - test_todo: allow [!] grep as the command
774
- - tests: add test_todo() to mark known breakages
630
+ . test_todo: allow [verbose] test as the command
631
+ . test_todo: allow [!] grep as the command
632
+ . tests: add test_todo() to mark known breakages
633
634
RFC for test framework improvement.
635
@@ -779,10 +637,11 @@ for convenience (replace "htmldocs" with "manpages" for the manual
637
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
638
639
782
-* ab/coccicheck-incremental (2022-10-26) 12 commits
640
+* 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
@@ -797,4 +656,4 @@ for convenience (replace "htmldocs" with "manpages" for the manual
656
incrementally.
657
658
Will merge to 'next'?
800
- source: <cover-v4-00.12-00000000000-20221026T141005Z-avarab@gmail.com>
659
+ source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com>