What's cooking (2022/10 #09)
Taylor Blau committed
Oct 31, 2022 at 01:19 UTC
729f1ccbd9f6b488cdb07a8bc4ca4be110ab3385
1 file changed
+460
-545
whats-cooking.txt
+460
-545
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2022, #08; Fri, 28)
3
-X-master-at: 63bba4fdd86d80ef061c449daa97a981a9be0792
4
-X-next-at: 37b22c650d22cf3ee7c1d89d0a08614485da773a
2
+Subject: What's cooking in git.git (Oct 2022, #09; Mon, 31)
3
+X-master-at: c03801e19cb8ab36e9c0d17ff3d5e0c3b0f24193
4
+X-next-at: 9c842762fa910556468148797cfe94af2a5abbb2
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2022, #08; Fri, 28)
7
+What's cooking in git.git (Oct 2022, #09; Mon, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,10 +14,13 @@ 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
-Starting from next week (week #4---see https://tinyurl.com/gitCal),
18
-we'll try a mini "bus factor" exercise, where I will disappear from
19
-the list for a few weeks. See the previous issue of this report
20
-for details: https://lore.kernel.org/git/xmqqwn8mh1di.fsf@gitster.g/
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.
24
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
@@ -25,282 +28,381 @@ repositories have only a subset of branches.
28
29
With maint, master, next, seen, todo:
30
31
+ https://github.com/git/git/
32
+
33
+The following mirrors are currently out-of-date while the usual
34
+maintainer is offline.
35
+
36
git://git.kernel.org/pub/scm/git/git.git/
37
git://repo.or.cz/alt-git.git/
38
https://kernel.googlesource.com/pub/scm/git/git/
31
- https://github.com/git/git/
39
https://gitlab.com/git-vcs/git/
40
41
With all the integration branches and topics broken out:
42
36
- https://github.com/gitster/git/
43
+ https://github.com/ttaylorr/git/
44
45
Even though the preformatted documentation in HTML and man format
39
-are not sources, they are published in these repositories for
40
-convenience (replace "htmldocs" with "manpages" for the manual
41
-pages):
46
+are not sources, they are typically published in these repositories
47
+for convenience (replace "htmldocs" with "manpages" for the manual
48
+ pages):
49
50
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
51
https://github.com/gitster/git-htmldocs.git/
52
46
-Release tarballs are available at:
53
+...but these and the release tarballs below are similarly out-of-date:
54
55
https://www.kernel.org/pub/software/scm/git/
56
57
--------------------------------------------------
58
[Graduated to 'master']
59
53
-* ab/doc-synopsis-and-cmd-usage (2022-10-13) 34 commits
54
- (merged to 'next' on 2022-10-21 at c6d632ac1a)
55
- + tests: assert consistent whitespace in -h output
56
- + tests: start asserting that *.txt SYNOPSIS matches -h output
57
- + doc txt & -h consistency: make "worktree" consistent
58
- + worktree: define subcommand -h in terms of command -h
59
- + reflog doc: list real subcommands up-front
60
- + doc txt & -h consistency: make "commit" consistent
61
- + doc txt & -h consistency: make "diff-tree" consistent
62
- + doc txt & -h consistency: use "[<label>...]" for "zero or more"
63
- + doc txt & -h consistency: make "annotate" consistent
64
- + doc txt & -h consistency: make "stash" consistent
65
- + doc txt & -h consistency: add missing options
66
- + doc txt & -h consistency: use "git foo" form, not "git-foo"
67
- + doc txt & -h consistency: make "bundle" consistent
68
- + doc txt & -h consistency: make "read-tree" consistent
69
- + doc txt & -h consistency: make "rerere" consistent
70
- + doc txt & -h consistency: add missing options and labels
71
- + doc txt & -h consistency: make output order consistent
72
- + doc txt & -h consistency: add or fix optional "--" syntax
73
- + doc txt & -h consistency: fix mismatching labels
74
- + doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
75
- + doc txt & -h consistency: use "<options>", not "<options>..."
76
- + stash doc SYNOPSIS & -h: correct padding around "[]()"
77
- + doc txt & -h consistency: correct padding around "[]()"
78
- + doc txt & -h consistency: balance unbalanced "[" and "]"
79
- + doc txt & -h consistency: add "-z" to cat-file "-h"
80
- + doc txt & -h consistency: fix incorrect alternates syntax
81
- + doc txt & -h consistency: word-wrap
82
- + built-ins: consistently add "\n" between "usage" and options
83
- + doc SYNOPSIS: consistently use ' for commands
84
- + doc SYNOPSIS: don't use ' for subcommands
85
- + bundle: define subcommand -h in terms of command -h
86
- + builtin/bundle.c: indent with tabs
87
- + CodingGuidelines: update and clarify command-line conventions
88
- + tests: assert *.txt SYNOPSIS and -h output
89
-
90
- The short-help text shown by "git cmd -h" and the synopsis text
91
- shown at the beginning of "git help cmd" have been made more
92
- consistent.
93
- source: <cover-v5-00.34-00000000000-20221013T153625Z-avarab@gmail.com>
94
-
95
-
96
-* ab/run-hook-api-cleanup (2022-10-12) 15 commits
97
- (merged to 'next' on 2022-10-20 at 29ca8c34dc)
98
- + run-command.c: remove "max_processes", add "const" to signal() handler
99
- + run-command.c: pass "opts" further down, and use "opts->processes"
100
- + run-command.c: use "opts->processes", not "pp->max_processes"
101
- + run-command.c: don't copy "data" to "struct parallel_processes"
102
- + run-command.c: don't copy "ungroup" to "struct parallel_processes"
103
- + run-command.c: don't copy *_fn to "struct parallel_processes"
104
- + run-command.c: make "struct parallel_processes" const if possible
105
- + run-command API: move *_tr2() users to "run_processes_parallel()"
106
- + run-command API: have run_process_parallel() take an "opts" struct
107
- + run-command.c: use designated init for pp_init(), add "const"
108
- + run-command API: don't fall back on online_cpus()
109
- + run-command API: make "n" parameter a "size_t"
110
- + run-command tests: use "return", not "exit"
111
- + run-command API: have "run_processes_parallel{,_tr2}()" return void
112
- + run-command test helper: use "else if" pattern
113
- (this branch is used by cw/submodule-status-in-parallel.)
114
-
115
- Move a global variable added as a hack during regression fixes to
116
- its proper place in the API.
117
- source: <cover-v3-00.15-00000000000-20221012T205712Z-avarab@gmail.com>
118
-
119
-
120
-* jk/unused-anno-more (2022-10-17) 12 commits
121
- (merged to 'next' on 2022-10-20 at 0e52ab6cf9)
122
- + ll-merge: mark unused parameters in callbacks
123
- + diffcore-pickaxe: mark unused parameters in pickaxe functions
124
- + convert: mark unused parameter in null stream filter
125
- + apply: mark unused parameters in noop error/warning routine
126
- + apply: mark unused parameters in handlers
127
- + date: mark unused parameters in handler functions
128
- + string-list: mark unused callback parameters
129
- + object-file: mark unused parameters in hash_unknown functions
130
- + mark unused parameters in trivial compat functions
131
- + update-index: drop unused argc from do_reupdate()
132
- + submodule--helper: drop unused argc from module_list_compute()
133
- + diffstat_consume(): assert non-zero length
134
-
135
- More UNUSED annotation to help using -Wunused option with the
136
- compiler.
137
- source: <Y036whEorZV0rOgB@coredump.intra.peff.net>
138
-
139
-
140
-* js/cmake-updates (2022-10-19) 5 commits
141
- (merged to 'next' on 2022-10-21 at 012ec675ba)
142
- + cmake: increase time-out for a long-running test
143
- + cmake: avoid editing t/test-lib.sh
144
- + add -p: avoid ambiguous signed/unsigned comparison
145
- + cmake: copy the merge tools for testing
146
- + cmake: make it easier to diagnose regressions in CTest runs
147
-
148
- Update to build procedure with VS using CMake/CTest.
149
- source: <pull.1320.v3.git.1666090745.gitgitgadget@gmail.com>
150
-
151
-
152
-* mm/git-pm-try-catch-syntax-fix (2022-10-22) 2 commits
153
- (merged to 'next' on 2022-10-23 at 011a23710f)
154
- + Git.pm: trust rev-parse to find bare repositories
155
- (merged to 'next' on 2022-10-21 at 7896738c3b)
156
- + Git.pm: add semicolon after catch statement
157
-
158
- Fix a longstanding syntax error in Git.pm error codepath.
159
- source: <20221016212236.12453-1-michael@mcclimon.org>
160
- source: <Y1Rdtog/XQV0YLj0@coredump.intra.peff.net>
161
-
162
-
163
-* nw/t1002-cleanup (2022-10-14) 1 commit
164
- (merged to 'next' on 2022-10-20 at e6ae742fef)
165
- + t1002: modernize outdated conditional
166
-
167
- Code clean-up in test.
168
- source: <pull.1362.v3.git.git.1665734502591.gitgitgadget@gmail.com>
169
-
170
-
171
-* tb/diffstat-with-utf8-strwidth (2022-10-21) 2 commits
172
- (merged to 'next' on 2022-10-23 at 43a17bfeac)
173
- + diff: leave NEEDWORK notes in show_stats() function
174
- + diff.c: use utf8_strwidth() to count display width
175
-
176
- "git diff --stat" etc. were invented back when everything was ASCII
177
- and strlen() was a way to measure the display width of a string;
178
- adjust them to compute the display width assuming UTF-8 pathnames.
179
- source: <20220914151333.3309-1-tboegi@web.de>
180
-
181
-
182
-* tb/midx-bitmap-selection-fix (2022-10-13) 4 commits
183
- (merged to 'next' on 2022-10-20 at b4d98bb5e4)
184
- + pack-bitmap-write.c: instrument number of reused bitmaps
185
- + midx.c: instrument MIDX and bitmap generation with trace2 regions
186
- + midx.c: consider annotated tags during bitmap selection
187
- + midx.c: fix whitespace typo
188
-
189
- A bugfix with tracing support in midx codepath
190
- source: <cover.1665612094.git.me@ttaylorr.com>
191
-
192
-
193
-* tb/remove-unused-pack-bitmap (2022-10-17) 1 commit
194
- (merged to 'next' on 2022-10-21 at ebb68add44)
195
- + builtin/repack.c: remove redundant pack-based bitmaps
196
-
197
- When creating a multi-pack bitmap, remove per-pack bitmap files
198
- unconditionally as they will never be consulted.
199
- source: <1e0ef7ee7ff5feb323c77e594cd65433fb1d99f7.1666061096.git.me@ttaylorr.com>
200
-
201
-
202
-* tb/save-keep-pack-during-geometric-repack (2022-10-17) 1 commit
203
- (merged to 'next' on 2022-10-20 at c88c17eb52)
204
- + repack: don't remove .keep packs with `--pack-kept-objects`
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
206
- When geometric repacking feature is in use together with the
207
- --pack-kept-objects option, we lost packs marked with .keep files.
208
- source: <6a012cd625c1d197ede91c85299cbfb37adf356b.1666059872.git.me@ttaylorr.com>
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
307
--------------------------------------------------
308
[New Topics]
309
213
-* ab/config-multi-and-nonbool (2022-10-27) 10 commits
214
- - for-each-repo: with bad config, don't conflate <path> and <cmd>
215
- - config API: add "string" version of *_value_multi(), fix segfaults
216
- - config tests: add "NULL" tests for *_get_value_multi()
217
- - config API: add and use "lookup_value" functions
218
- - builtin/gc.c: use "unsorted_string_list_has_string()" where appropriate
219
- - string-list API: make has_string() and list_lookup() "const"
220
- - string-list API: mark "struct_string_list" to "for_each_string_list" const
221
- - config API: mark *_multi() with RESULT_MUST_BE_USED
222
- - for-each-repo: error on bad --config
223
- - config API: have *_multi() return an "int" and take a "dest"
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
225
- A mixed bag of config API updates.
323
+ Fix assorted issues with CTest on *nix machines.
324
227
- Expecting a reroll.
228
- cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
229
- source: <cover-00.10-00000000000-20221026T151328Z-avarab@gmail.com>
325
+ Waiting for review.
326
+ source: <cover-v2-00.11-00000000000-20221027T032622Z-avarab@gmail.com>
327
328
232
-* ab/sha-makefile-doc (2022-10-26) 9 commits
233
- - Makefile: discuss SHAttered in *_SHA{1,256} discussion
234
- - Makefile: document default SHA-1 backend on OSX
235
- - Makefile: document SHA-1 and SHA-256 default and selection order
236
- - Makefile: document default SHA-256 backend
237
- - Makefile: rephrase the discussion of *_SHA1 knobs
238
- - Makefile: create and use sections for "define" flag listing
239
- - Makefile: correct DC_SHA1 documentation
240
- - INSTALL: remove discussion of SHA-1 backends
241
- - Makefile: always (re)set DC_SHA1 on fallback
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
243
- Makefile comments updates and reordering to clarify knobs used to
244
- choose SHA implementations.
334
+ Resolve issues with the bin-wrappers/% rules where "make
335
+ bin-wrappers/git" would generate the script but not "git" itself.
336
246
- Will merge to 'next'?
247
- source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com>
337
+ Waiting for review.
338
+ source: <cover-v2-0.3-00000000000-20221026T143533Z-avarab@gmail.com>
339
340
250
-* rs/no-more-run-command-v (2022-10-28) 9 commits
251
- - run-command: fix return value comment
252
- - replace and remove run_command_v_opt()
253
- - replace and remove run_command_v_opt_cd_env_tr2()
254
- - replace and remove run_command_v_opt_tr2()
255
- - replace and remove run_command_v_opt_cd_env()
256
- - use child_process member "args" instead of string array variable
257
- - use child_process members "args" and "env" directly
258
- - bisect--helper: factor out do_bisect_run()
259
- - merge: remove always-the-same "verbose" arguments
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
345
261
- Simplify the run-command API.
346
+ Various test updates.
347
263
- Will merge to 'next'?
264
- source: <7407e074-4bd8-b351-7fa4-baf59b41880c@web.de>
265
- source: <8428e83f-9deb-e928-8699-b5b13e8b7577@web.de>
348
+ Waiting for review.
349
+ source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
350
351
268
-* tb/howto-using-redo-script (2022-10-26) 1 commit
269
- - Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
352
+* do/modernize-t7001 (2022-10-31) 1 commit
353
+ - t7001-mv.sh:modernizing test script using function
354
271
- Doc update.
355
+ Modernize test script to avoid "test -f" and friends.
356
357
Will merge to 'next'.
274
- source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
358
+ source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com>
359
360
277
-* ps/receive-use-only-advertised (2022-10-28) 3 commits
278
- - SQUASH - leakfix
279
- - receive-pack: use advertised reference tips to inform connectivity check
280
- - connected: allow supplying different view of reachable objects
361
+* kz/merge-tree-merge-base (2022-10-29) 1 commit
362
+ - merge-tree.c: add --merge-base=<commit> option
363
282
- "git receive-pack" used to use all the local refs as the boundary
283
- for checking connectivity of the data "git push" sent, but now it
284
- uses only the refs that it advertised to the pusher. In a
285
- repository with the .hideRefs configuration, this reduces the
286
- resource needed to perform the check, and also forces the pusher to
287
- prove they have all objects that are necessary to complete the
288
- history on top of only the history available to them.
364
+ "merge-tree" learns a new `--merge-base` option.
365
290
- Expecting a reroll.
291
- cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
292
- cf. <xmqqr0yrizqm.fsf@gitster.g>
293
- source: <cover.1666967670.git.ps@pks.im>
366
+ Waiting for review.
367
+ source: <pull.1397.v3.git.1667014975042.gitgitgadget@gmail.com>
368
369
296
-* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
297
- - adjust_shared_perm(): leave g+s alone when the group does not matter
370
+* mh/password-can-be-pat (2022-10-30) 1 commit
371
+ - Mention that password could be a personal access token.
372
299
- The adjust_shared_perm() helper function learned to refrain from
300
- setting the "g+s" bit on directories when it is not necessary.
373
+ Documentation update to git-credential(1).
374
+
375
+ Will merge to 'next'.
376
+ source: <pull.1396.git.1666845947898.gitgitgadget@gmail.com>
377
+
378
+
379
+* po/pretty-hard-trunc (2022-10-30) 1 commit
380
+ - pretty-formats: add hard truncation, without ellipsis, options
381
+
382
+ Add a new pretty format which truncates without ellipsis.
383
+
384
+ Missing test coverage.
385
+ source: <20221030185614.3842-1-philipoakley@iee.email>
386
302
- Will merge to 'next'??
303
- source: <xmqqr0yrhco6.fsf@gitster.g>
387
+
388
+* rr/long-status-advice (2022-10-31) 1 commit
389
+ - status: long status advice adapted to recent capabilities
390
+
391
+ The advice message emitted by a slow "status" run is amended to
392
+ mention fsmonitor.
393
+
394
+ Waiting for reviewer feedback on the updated round.
395
+ source: <pull.1384.v2.git.1667002005494.gitgitgadget@gmail.com>
396
+
397
+
398
+* rs/archive-filter-error-once (2022-10-30) 1 commit
399
+ - archive-tar: report filter start error only once
400
+
401
+ "git archive" mistakenly complained twice about a missing executable,
402
+ which has been corrected.
403
+
404
+ Will merge to 'next'.
405
+ source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>
406
407
--------------------------------------------------
408
[Stalled]
@@ -428,160 +530,148 @@ Release tarballs are available at:
530
--------------------------------------------------
531
[Cooking]
532
431
-* gc/submodule-clone-update-with-branches (2022-10-28) 8 commits
432
- - clone, submodule update: create and check out branches
433
- - submodule--helper: remove update_data.suboid
434
- - submodule update: refactor update targets
435
- - submodule: return target of submodule symref
436
- - t5617: drop references to remote-tracking branches
437
- - submodule--helper clone: create named branch
438
- - repo-settings: add submodule_propagate_branches
439
- - clone: teach --detach option
440
-
441
- "git clone --recurse-submodules" and "git submodule update" learns
442
- to honor the "propagete branches" option.
443
- source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
444
-
445
-
446
-* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
447
- - config: let feature.experimental imply gc.cruftPacks=true
448
- - gc: add tests for --cruft and friends
449
-
450
- Enable gc.cruftpacks by default for those who opt into
451
- feature.experimental setting.
452
-
453
- Will merge to 'next'.
454
- source: <cover.1666819953.git.me@ttaylorr.com>
455
-
456
-
457
-* tb/shortlog-group (2022-10-24) 7 commits
458
- (merged to 'next' on 2022-10-26 at 76e64a6036)
459
- + shortlog: implement `--group=committer` in terms of `--group=<format>`
460
- + shortlog: implement `--group=author` in terms of `--group=<format>`
461
- + shortlog: extract `shortlog_finish_setup()`
462
- + shortlog: support arbitrary commit format `--group`s
463
- + shortlog: extract `--group` fragment for translation
464
- + shortlog: make trailer insertion a noop when appropriate
465
- + shortlog: accept `--date`-related options
466
-
467
- "git shortlog" learned to group by the "format" string.
468
-
469
- Will merge to 'master'.
470
- source: <cover.1666637725.git.me@ttaylorr.com>
533
+* ab/config-multi-and-nonbool (2022-10-27) 10 commits
534
+ - for-each-repo: with bad config, don't conflate <path> and <cmd>
535
+ - 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
542
+ - for-each-repo: error on bad --config
543
+ - config API: have *_multi() return an "int" and take a "dest"
544
545
+ A mixed bag of config API updates.
546
473
-* pw/config-int-parse-fixes (2022-10-22) 3 commits
474
- - git_parse_signed(): avoid integer overflow
475
- - config: require at least one digit when parsing numbers
476
- - git_parse_unsigned: reject negative values
547
+ Expecting a reroll.
548
+ cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
549
+ source: <cover-00.10-00000000000-20221026T151328Z-avarab@gmail.com>
550
478
- Assorted fixes of parsing end-user input as integers.
551
480
- Expecting a reroll to add test coverage.
481
- cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
482
- source: <pull.1389.git.1666359915.gitgitgadget@gmail.com>
552
+* ab/sha-makefile-doc (2022-10-26) 9 commits
553
+ - Makefile: discuss SHAttered in *_SHA{1,256} discussion
554
+ - Makefile: document default SHA-1 backend on OSX
555
+ - Makefile: document SHA-1 and SHA-256 default and selection order
556
+ - Makefile: document default SHA-256 backend
557
+ - Makefile: rephrase the discussion of *_SHA1 knobs
558
+ - Makefile: create and use sections for "define" flag listing
559
+ - Makefile: correct DC_SHA1 documentation
560
+ - INSTALL: remove discussion of SHA-1 backends
561
+ - Makefile: always (re)set DC_SHA1 on fallback
562
563
+ Makefile comments updates and reordering to clarify knobs used to
564
+ choose SHA implementations.
565
485
-* sa/cat-file-mailmap (2022-10-21) 1 commit
486
- - doc/cat-file: allow --use-mailmap for --batch options
566
+ Will merge to 'next'?
567
+ source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com>
568
488
- Doc updates.
569
490
- Waiting for review response.
491
- source: <20221021103442.202759-1-siddharthasthana31@gmail.com>
570
+* 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
583
584
+ Simplify the run-command API.
585
494
-* sg/stable-docdep (2022-10-21) 1 commit
495
- (merged to 'next' on 2022-10-26 at 68432e1b2c)
496
- + Documentation/build-docdep.perl: generate sorted output
586
+ Will merge to 'next'.
587
+ source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de>
588
498
- Make sure generated dependency file is stably sorted to help
499
- developers debugging their build issues.
589
501
- Will merge to 'master'.
502
- source: <20221021102950.539148-1-szeder.dev@gmail.com>
590
+* tb/howto-using-redo-script (2022-10-26) 1 commit
591
+ - Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
592
593
+ Doc update.
594
505
-* pb/subtree-split-and-merge-after-squashing-tag-fix (2022-10-21) 9 commits
506
- (merged to 'next' on 2022-10-27 at 4f2134dd87)
507
- + subtree: fix split after annotated tag was squashed merged
508
- + subtree: fix squash merging after annotated tag was squashed merged
509
- + subtree: process 'git-subtree-split' trailer in separate function
510
- + subtree: use named variables instead of "$@" in cmd_pull
511
- + subtree: define a variable before its first use in 'find_latest_squash'
512
- + subtree: prefix die messages with 'fatal'
513
- + subtree: add 'die_incompatible_opt' function to reduce duplication
514
- + subtree: use 'git rev-parse --verify [--quiet]' for better error messages
515
- + test-lib-functions: mark 'test_commit' variables as 'local'
595
+ Will merge to 'next'.
596
+ source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
597
517
- A bugfix to "git subtree" in its split and merge features.
598
519
- Will merge to 'master'.
520
- source: <pull.1390.git.1666365219.gitgitgadget@gmail.com>
599
+* ps/receive-use-only-advertised (2022-10-28) 3 commits
600
+ - SQUASH - leakfix
601
+ - receive-pack: use advertised reference tips to inform connectivity check
602
+ - connected: allow supplying different view of reachable objects
603
604
+ "git receive-pack" used to use all the local refs as the boundary
605
+ for checking connectivity of the data "git push" sent, but now it
606
+ uses only the refs that it advertised to the pusher. In a
607
+ repository with the .hideRefs configuration, this reduces the
608
+ resource needed to perform the check, and also forces the pusher to
609
+ prove they have all objects that are necessary to complete the
610
+ history on top of only the history available to them.
611
523
-* jk/repack-tempfile-cleanup (2022-10-23) 6 commits
524
- (merged to 'next' on 2022-10-26 at e706eb120c)
525
- + t7700: annotate cruft-pack failure with ok=sigpipe
526
- + repack: drop remove_temporary_files()
527
- + repack: use tempfiles for signal cleanup
528
- + repack: expand error message for missing pack files
529
- + repack: populate extension bits incrementally
530
- + repack: convert "names" util bitfield to array
612
+ Expecting a reroll.
613
+ cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
614
+ cf. <xmqqr0yrizqm.fsf@gitster.g>
615
+ source: <cover.1666967670.git.ps@pks.im>
616
532
- The way "git repack" creared temporary files when it received a
533
- signal was prone to deadlocking, which has been corrected.
617
535
- Will merge to 'master'.
536
- source: <Y1M3fVnixJHvKiSg@coredump.intra.peff.net>
618
+* 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
620
621
+ The adjust_shared_perm() helper function learned to refrain from
622
+ setting the "g+s" bit on directories when it is not necessary.
623
539
-* en/ort-dir-rename-and-symlink-fix (2022-10-22) 1 commit
540
- (merged to 'next' on 2022-10-27 at 56f1e5222d)
541
- + merge-ort: fix bug with dir rename vs change dir to symlink
624
+ Will merge to 'next'.
625
+ source: <xmqqr0yrhco6.fsf@gitster.g>
626
543
- Merging a branch with directory renames into a branch that changes
544
- the directory to a symlink was mishandled by the ort merge
545
- strategy, which has been corrected.
627
547
- Will merge to 'master'.
548
- source: <pull.1391.git.1666465450590.gitgitgadget@gmail.com>
628
+* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
629
+ - clone, submodule update: create and check out branches
630
+ - submodule--helper: remove update_data.suboid
631
+ - submodule update: refactor update targets
632
+ - submodule: return target of submodule symref
633
+ - t5617: drop references to remote-tracking branches
634
+ - submodule--helper clone: create named branch
635
+ - repo-settings: add submodule_propagate_branches
636
+ - clone: teach --detach option
637
638
+ "git clone --recurse-submodules" and "git submodule update" learns
639
+ to honor the "propagete branches" option.
640
551
-* en/merge-tree-sequence (2022-10-22) 2 commits
552
- (merged to 'next' on 2022-10-28 at 31459cd5a8)
553
- + merge-tree: support multiple batched merges with --stdin
554
- + merge-tree: update documentation for differences in -z output
641
+ Waiting for review.
642
+ source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
643
556
- "git merge-tree --stdin" is a new way to request a series of merges
557
- and report the merge results.
644
559
- Will merge to 'master'.
560
- source: <pull.1361.git.1666488485.gitgitgadget@gmail.com>
645
+* 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
648
649
+ Enable gc.cruftpacks by default for those who opt into
650
+ feature.experimental setting.
651
563
-* rs/absorb-git-dir-simplify (2022-10-23) 1 commit
564
- (merged to 'next' on 2022-10-26 at 3d23cfd399)
565
- + submodule: use strvec_pushf() for --super-prefix
652
+ Will merge to 'next'.
653
+ source: <cover.1666819953.git.me@ttaylorr.com>
654
567
- Code simplification by using strvec_pushf() instead of building an
568
- argument in a separate strbuf.
655
570
- Will merge to 'master'.
571
- source: <7a4e2fc6-3e01-5683-2be5-13b7e67c7fe5@web.de>
656
+* 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
660
661
+ Assorted fixes of parsing end-user input as integers.
662
574
-* jc/doc-fsck-msgids (2022-10-25) 4 commits
575
- (merged to 'next' on 2022-10-28 at 3c00edabf8)
576
- + Documentation: add lint-fsck-msgids
577
- + fsck: document msg-id
578
- + fsck: remove the unused MISSING_TREE_OBJECT
579
- + fsck: remove the unused BAD_TAG_OBJECT
663
+ Expecting a reroll to add test coverage.
664
+ cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
665
+ source: <pull.1389.git.1666359915.gitgitgadget@gmail.com>
666
581
- Add documentation for message IDs in fsck error messages.
667
583
- Will merge to 'master'.
584
- source: <20221025224224.2352979-1-gitster@pobox.com>
668
+* sa/cat-file-mailmap (2022-10-21) 1 commit
669
+ - doc/cat-file: allow --use-mailmap for --batch options
670
+
671
+ Doc updates.
672
+
673
+ Waiting for review response.
674
+ source: <20221021103442.202759-1-siddharthasthana31@gmail.com>
675
676
677
* tb/repack-expire-to (2022-10-24) 4 commits
@@ -593,7 +683,7 @@ Release tarballs are available at:
683
"git repack" learns to send cruft objects out of the way into
684
packfiles outside the repository.
685
596
- Will merge to 'next'?
686
+ Waiting for review.
687
source: <cover.1666636974.git.me@ttaylorr.com>
688
689
@@ -608,27 +698,6 @@ Release tarballs are available at:
698
source: <20221025122856.20204-1-christian.couder@gmail.com>
699
700
611
-* tb/cap-patch-at-1gb (2022-10-25) 1 commit
612
- (merged to 'next' on 2022-10-27 at f0b4f9c12a)
613
- + apply: reject patches larger than ~1 GiB
614
-
615
- "git apply" limits its input to a bit less than 1 GiB.
616
-
617
- Will merge to 'master'.
618
- source: <70f5763834dff373a5573a99ec4cdfa36cadf34c.1666722251.git.me@ttaylorr.com>
619
-
620
-
621
-* tb/midx-cleanup-fix (2022-10-25) 1 commit
622
- - midx.c: clear auxiliary MIDX files first
623
-
624
- The order in which multi-pack-index and its associated files are
625
- dropped has been tweaked to make it safer for concurrent users.
626
-
627
- Under discussion, but leaning to negative..
628
- cf. <143a588a-c98b-733b-2b23-34a87ca89431@github.com>
629
- source: <bf36093cd6d7ac83b16241b0199b3a8c904e6774.1666722316.git.me@ttaylorr.com>
630
-
631
-
701
* al/trace2-clearing-skip-worktree (2022-10-28) 2 commits
702
- SQUASH???
703
- index: add trace2 region for clear skip worktree
@@ -640,49 +709,17 @@ Release tarballs are available at:
709
source: <pull.1368.v2.git.git.1666917961644.gitgitgadget@gmail.com>
710
711
643
-* jt/skipping-negotiator-wo-recursion (2022-10-25) 1 commit
644
- (merged to 'next' on 2022-10-28 at 4a2588ab9e)
645
- + negotiator/skipping: avoid stack overflow
646
-
647
- Rewrite a deep recursion in the skipping negotiator to use a loop
648
- with on-heap prio queue to avoid stack wastage.
649
-
650
- Will merge to 'master'.
651
- source: <20221025232934.1504445-1-jonathantanmy@google.com>
652
-
653
-
654
-* rj/branch-copy-rename-error-codepath-cleanup (2022-10-26) 1 commit
655
- (merged to 'next' on 2022-10-27 at f01a4ff619)
656
- + branch: error copying or renaming a detached HEAD
657
-
658
- Code simplification.
659
-
660
- Will merge to 'master'.
661
- source: <0ac8cd48-08d7-9bdd-b074-c8d5ded522f6@gmail.com>
662
-
663
-
664
-* rj/branch-do-not-exit-with-minus-one-status (2022-10-26) 1 commit
665
- (merged to 'next' on 2022-10-27 at 061f63d4e2)
666
- + branch: error code with --edit-description
667
-
668
- "git branch --edit-description" can exit with status -1 which is
669
- not a good practice; it learned to use 1 as everybody else instead.
670
-
671
- Will merge to 'master'.
672
- source: <b0f96b35-4e69-a889-bcdf-e0b40b89384f@gmail.com>
673
-
674
-
675
-* po/glossary-around-traversal (2022-10-22) 3 commits
712
+* 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
717
718
The glossary entries for "commit-graph file" and "reachability
719
bitmap" have been added.
720
683
- Expecting a (hopefully final) reroll.
684
- cf. <746491f4-fb41-92fe-7360-20a845dc21fc@iee.email>
685
- source: <20221022222539.2333-1-philipoakley@iee.email>
721
+ Will merge to 'next'.
722
+ source: <20221029164112.2097-1-philipoakley@iee.email>
723
724
725
* mc/credential-helper-auth-headers (2022-10-21) 6 commits
@@ -699,63 +736,17 @@ Release tarballs are available at:
736
source: <pull.1352.v2.git.1666372083.gitgitgadget@gmail.com>
737
738
702
-* jr/embargoed-releases-doc (2022-10-24) 1 commit
703
- (merged to 'next' on 2022-10-27 at c000502eaa)
704
- + embargoed releases: also describe the git-security list and the process
705
-
706
- The role the security mailing list plays in an embargoed release
707
- has been documented.
708
-
709
- Will merge to 'master'.
710
- source: <pull.1345.v4.git.1666649239302.gitgitgadget@gmail.com>
711
-
712
-
713
-* jh/trace2-timers-and-counters (2022-10-24) 8 commits
714
- (merged to 'next' on 2022-10-26 at e4933e2658)
715
- + trace2: add global counter mechanism
716
- + trace2: add stopwatch timers
717
- + trace2: convert ctx.thread_name from strbuf to pointer
718
- + trace2: improve thread-name documentation in the thread-context
719
- + trace2: rename the thread_name argument to trace2_thread_start
720
- + api-trace2.txt: elminate section describing the public trace2 API
721
- + tr2tls: clarify TLS terminology
722
- + trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
723
-
724
- Two new facilities, "timer" and "counter", are introduced to the
725
- trace2 API.
726
-
727
- Will merge to 'master'.
728
- source: <pull.1373.v4.git.1666618868.gitgitgadget@gmail.com>
729
-
730
-
731
-* jz/patch-id (2022-10-24) 6 commits
732
- (merged to 'next' on 2022-10-24 at 1ac3b46fbe)
733
- + builtin: patch-id: remove unused diff-tree prefix
734
- + builtin: patch-id: add --verbatim as a command mode
735
- + patch-id: fix patch-id for mode changes
736
- + builtin: patch-id: fix patch-id with binary diffs
737
- + patch-id: use stable patch-id for rebases
738
- + patch-id: fix stable patch id for binary / header-only
739
-
740
- A new "--include-whitespace" option is added to "git patch-id", and
741
- existing bugs in the internal patch-id logic that did not match
742
- what "git patch-id" produces have been corrected.
743
-
744
- Will merge to 'master'.
745
- source: <pull.1359.v5.git.1666642064.gitgitgadget@gmail.com>
746
-
747
-
739
* hl/archive-recursive (2022-10-19) 10 commits
749
- . fixup! archive: add tests for git archive --recurse-submodules
750
- . archive: add tests for git archive --recurse-submodules
751
- . archive: add --recurse-submodules to git-archive command
752
- . archive: remove global repository from archive_args
753
- . archive: pass repo objects to write_archive handlers
754
- . tree: add repository parameter to read_tree_fn_t
755
- . tree: handle submodule case for read_tree_at properly
756
- . tree: increase test coverage for tree.c
757
- . tree: update cases to use repo_ tree methods
758
- . tree: do not use the_repository for tree traversal methods.
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.
750
751
"git archive" has been taught "--recurse-submodules" option to
752
create a tarball that includes contents from submodules.
@@ -768,58 +759,6 @@ Release tarballs are available at:
759
source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
760
761
771
-* pw/rebase-keep-base-fixes (2022-10-17) 8 commits
772
- (merged to 'next' on 2022-10-27 at 802359afac)
773
- + rebase --keep-base: imply --no-fork-point
774
- + rebase --keep-base: imply --reapply-cherry-picks
775
- + rebase: factor out branch_base calculation
776
- + rebase: rename merge_base to branch_base
777
- + rebase: store orig_head as a commit
778
- + rebase: be stricter when reading state files containing oids
779
- + t3416: set $EDITOR in subshell
780
- + t3416: tighten two tests
781
- (this branch is used by pw/rebase-reflog-fixes.)
782
-
783
- "git rebase --keep-base" used to discard the commits that are
784
- already cherry-picked to the upstream, even when "keep-base" meant
785
- that the base, on top of which the history is being rebuilt, does
786
- not yet include these cherry-picked commits. The --keep-base
787
- option now implies --reapply-cherry-picks and --no-fork-point
788
- options.
789
-
790
- Will merge to 'master'.
791
- source: <pull.1323.v4.git.1666012665.gitgitgadget@gmail.com>
792
-
793
-
794
-* pw/rebase-reflog-fixes (2022-10-17) 9 commits
795
- (merged to 'next' on 2022-10-27 at 60738821ef)
796
- + rebase: cleanup action handling
797
- + rebase --abort: improve reflog message
798
- + rebase --apply: make reflog messages match rebase --merge
799
- + rebase --apply: respect GIT_REFLOG_ACTION
800
- + rebase --merge: fix reflog message after skipping
801
- + rebase --merge: fix reflog when continuing
802
- + t3406: rework rebase reflog tests
803
- + rebase --apply: remove duplicated code
804
- + Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
805
- (this branch uses pw/rebase-keep-base-fixes.)
806
-
807
- Fix some bugs in the reflog messages when rebasing and changes the
808
- reflog messages of "rebase --apply" to match "rebase --merge" with
809
- the aim of making the reflog easier to parse.
810
-
811
- Will merge to 'master'.
812
- source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
813
-
814
-
815
-* sd/doc-smtp-encryption (2022-10-12) 1 commit
816
- (merged to 'next' on 2022-10-26 at b984763a1b)
817
- + docs: git-send-email: difference between ssl and tls smtp-encryption
818
-
819
- Will merge to 'master'.
820
- source: <20221012150619.12877-1-sndanailov@wired4ever.net>
821
-
822
-
762
* en/sparse-checkout-design (2022-10-08) 1 commit
763
- sparse-checkout.txt: new document with sparse-checkout directions
764
@@ -859,27 +798,3 @@ Release tarballs are available at:
798
799
Will merge to 'next'?
800
source: <cover-v4-00.12-00000000000-20221026T141005Z-avarab@gmail.com>
862
-
863
-
864
-* ds/bundle-uri-3 (2022-10-12) 13 commits
865
- (merged to 'next' on 2022-10-28 at 9d9092b4cc)
866
- + bundle-uri: suppress stderr from remote-https
867
- + bundle-uri: quiet failed unbundlings
868
- + bundle: add flags to verify_bundle()
869
- + bundle-uri: fetch a list of bundles
870
- + bundle: properly clear all revision flags
871
- + bundle-uri: limit recursion depth for bundle lists
872
- + bundle-uri: parse bundle list in config format
873
- + bundle-uri: unit test "key=value" parsing
874
- + bundle-uri: create "key=value" line parsing
875
- + bundle-uri: create base key-value pair parsing
876
- + bundle-uri: create bundle_list struct and helpers
877
- + bundle-uri: use plain string in find_temp_filename()
878
- + Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3
879
-
880
- Define the logical elements of a "bundle list", data structure to
881
- store them in-core, format to transfer them, and code to parse
882
- them.
883
-
884
- Will merge to 'master'.
885
- source: <pull.1333.v5.git.1665579160.gitgitgadget@gmail.com>