What's cooking (2022/10 #08)
Junio C Hamano committed
Oct 28, 2022 at 15:06 UTC
c6435b135c12430e8c99d879da65ed6e4e88c02a
1 file changed
+471
-503
whats-cooking.txt
+471
-503
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2022, #07; Wed, 26)
3
-X-master-at: c6de66bd952dbf9e155871be60e3eb5a0439dac9
4
-X-next-at: 7bbb16d38b18ad93d53518b845d432a38daad2ef
2
+Subject: What's cooking in git.git (Oct 2022, #08; Fri, 28)
3
+X-master-at: 63bba4fdd86d80ef061c449daa97a981a9be0792
4
+X-next-at: 37b22c650d22cf3ee7c1d89d0a08614485da773a
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2022, #07; Wed, 26)
7
+What's cooking in git.git (Oct 2022, #08; Fri, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,31 +14,10 @@ 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
-The security releases are over, and we have enough accumulated fixes
18
-on the 'master' front, I've merged a handful of them to 'maint'. We
19
-may or may not have a 2.38.2 release before we conclude this cycle.
20
-We'll see what happens.
21
-
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
24
-the list for a few weeks. Taylor agreed to volunteer as an interim
25
-maintainer and will take over the daily integration of the project
26
-in the meantime. The branches at https://github.com/git/git/
27
-repository will be updated to reflect the result of daily
28
-integration cycles by the interim maintainer during the exercise.
29
-
30
-Other repositories would not be (see below). Most importantly, the
31
-kernel.org one will be likely left stale. But the interim
32
-maintainer may choose to publish to other repositories and announce
33
-them on this list. One that may be handy to have is a repository as
34
-a replacement for https://github.com/gitster/git/ repository that
35
-hosts "broken out" topics.
36
-
37
-Around week #7, I'll come back and we will conclude the exercise.
38
-Note that the interim maintainer will really make decisions on what
39
-topics to accept and advance to 'next' and 'master' in these weeks,
40
-and I will accept these decisions when I come back and continue from
41
-there.
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/
21
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
@@ -71,105 +50,412 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[Graduated to 'master']
52
74
-* ab/grep-simplify-extended-expression (2022-10-11) 1 commit
75
- (merged to 'next' on 2022-10-13 at 07993f09bc)
76
- + grep.c: remove "extended" in favor of "pattern_expression", fix segfault
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
78
- Giving "--invert-grep" and "--all-match" without "--grep" to the
79
- "git log" command resulted in an attempt to access grep pattern
80
- expression structure that has not been allocated, which has been
81
- corrected.
82
- source: <patch-v2-1.1-6ad7627706f-20221011T094715Z-avarab@gmail.com>
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
85
-* ab/macos-build-fix-with-sha1dc (2022-10-19) 1 commit
86
- (merged to 'next' on 2022-10-19 at 408ce79f33)
87
- + fsmonitor OSX: compile with DC_SHA1=YesPlease
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
89
- Enable macOS build with sha1dc hash function.
90
- source: <patch-v2-1.4-392fabdb456-20221019T010222Z-avarab@gmail.com>
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
93
-* ds/cmd-main-reorder (2022-10-08) 1 commit
94
- (merged to 'next' on 2022-10-14 at d7f07dbecf)
95
- + git.c: improve code readability in cmd_main()
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
97
- Code clean-up.
98
- source: <pull.1355.v3.git.git.1665246097190.gitgitgadget@gmail.com>
135
+ More UNUSED annotation to help using -Wunused option with the
136
+ compiler.
137
+ source: <Y036whEorZV0rOgB@coredump.intra.peff.net>
138
139
101
-* gc/bare-repo-discovery (2022-10-13) 1 commit
102
- (merged to 'next' on 2022-10-17 at 3de2be7c14)
103
- + config: respect includes in protected config
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
105
- Allow configuration files in "protected" scopes to include other
106
- configuration files.
107
- source: <pull.1360.v2.git.git.1665683027912.gitgitgadget@gmail.com>
148
+ Update to build procedure with VS using CMake/CTest.
149
+ source: <pull.1320.v3.git.1666090745.gitgitgadget@gmail.com>
150
151
110
-* jc/ci-osx-with-sha1dc (2022-10-20) 1 commit
111
- (merged to 'next' on 2022-10-21 at 2d3312dfb9)
112
- + ci: use DC_SHA1=YesPlease on osx-clang job for CI
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
114
- Give a bit more diversity to macOS CI by using sha1dc in one of the
115
- jobs (the other one tests Apple Common Crypto).
116
- source: <xmqq35bitooc.fsf@gitster.g>
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
119
-* jc/more-sanitizer-at-ci (2022-10-20) 1 commit
120
- (merged to 'next' on 2022-10-21 at 91ec913532)
121
- + ci: add address and undefined sanitizer tasks
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
123
- Enable address and undefined sanitizer tasks at GitHub Actions CI.
124
- source: <xmqqpmezxl9p.fsf@gitster.g>
167
+ Code clean-up in test.
168
+ source: <pull.1362.v3.git.git.1665734502591.gitgitgadget@gmail.com>
169
170
127
-* jc/symbolic-ref-no-recurse (2022-10-09) 1 commit
128
- (merged to 'next' on 2022-10-13 at 532a3f6a5f)
129
- + symbolic-ref: teach "--[no-]recurse" option
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
131
- After checking out a "branch" that is a symbolic-ref that points at
132
- another branch, "git symbolic-ref HEAD" reports the underlying
133
- branch, not the symbolic-ref the user gave checkout as argument.
134
- The command learned the "--no-recurse" option to stop after
135
- dereferencing a symbolic-ref only once.
136
- source: <xmqqleprcn08.fsf@gitster.g>
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
139
-* jk/use-o0-in-leak-sanitizer (2022-10-19) 1 commit
140
- (merged to 'next' on 2022-10-19 at 27c2546b98)
141
- + Makefile: force -O0 when compiling with SANITIZE=leak
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
143
- Avoid false-positive from LSan whose assumption may be broken with
144
- higher optimization levels.
145
- source: <Y08JZVDgJpJvrBiz@coredump.intra.peff.net>
189
+ A bugfix with tracing support in midx codepath
190
+ source: <cover.1665612094.git.me@ttaylorr.com>
191
192
148
-* rj/branch-edit-description-with-nth-checkout (2022-10-10) 1 commit
149
- (merged to 'next' on 2022-10-14 at 90850a2211)
150
- + branch: support for shortcuts like @{-1}, completed
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
152
- "git branch --edit-description @{-1}" is now a way to edit branch
153
- description of the branch you were on before switching to the
154
- current branch.
155
- source: <fbf84e26-4306-c8df-0e2c-45dc94129e3a@gmail.com>
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
158
-* rs/diff-caret-bang-with-parents (2022-10-01) 3 commits
159
- (merged to 'next' on 2022-10-17 at 24609eb777)
160
- + diff: support ^! for merges
161
- + revisions.txt: unspecify order of resolved parts of ^!
162
- + revision: use strtol_i() for exclude_parent
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`
205
164
- "git diff rev^!" did not show combined diff to go to the rev from
165
- its parents.
166
- source: <16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de>
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>
209
210
--------------------------------------------------
211
[New Topics]
212
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"
224
+
225
+ A mixed bag of config API updates.
226
+
227
+ Expecting a reroll.
228
+ cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
229
+ source: <cover-00.10-00000000000-20221026T151328Z-avarab@gmail.com>
230
+
231
+
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
242
+
243
+ Makefile comments updates and reordering to clarify knobs used to
244
+ choose SHA implementations.
245
+
246
+ Will merge to 'next'?
247
+ source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com>
248
+
249
+
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
260
+
261
+ Simplify the run-command API.
262
+
263
+ Will merge to 'next'?
264
+ source: <7407e074-4bd8-b351-7fa4-baf59b41880c@web.de>
265
+ source: <8428e83f-9deb-e928-8699-b5b13e8b7577@web.de>
266
+
267
+
268
+* tb/howto-using-redo-script (2022-10-26) 1 commit
269
+ - Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
270
+
271
+ Doc update.
272
+
273
+ Will merge to 'next'.
274
+ source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
275
+
276
+
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
281
+
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.
289
+
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>
294
+
295
+
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
298
+
299
+ The adjust_shared_perm() helper function learned to refrain from
300
+ setting the "g+s" bit on directories when it is not necessary.
301
+
302
+ Will merge to 'next'??
303
+ source: <xmqqr0yrhco6.fsf@gitster.g>
304
+
305
+--------------------------------------------------
306
+[Stalled]
307
+
308
+* cw/submodule-status-in-parallel (2022-10-20) 7 commits
309
+ . diff-lib: parallelize run_diff_files for submodules
310
+ . diff-lib: refactor match_stat_with_submodule
311
+ . submodule: move status parsing into function
312
+ . submodule: strbuf variable rename
313
+ . run-command: add hide_output to run_processes_parallel_opts
314
+ . run-command: add pipe_output_fn to run_processes_parallel_opts
315
+ . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
316
+
317
+ Allow the internal "diff-files" engine to run "how has this
318
+ submodule changed?" in parallel to speed up "git status".
319
+
320
+ Breaks winVS test?
321
+ cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092>
322
+ source: <20221011232604.839941-1-calvinwan@google.com>
323
+
324
+
325
+* js/bisect-in-c (2022-08-30) 17 commits
326
+ . bisect: no longer try to clean up left-over `.git/head-name` files
327
+ . bisect: remove Cogito-related code
328
+ . Turn `git bisect` into a full built-in
329
+ . bisect: move even the command-line parsing to `bisect--helper`
330
+ . bisect--helper: make `state` optional
331
+ . bisect--helper: calling `bisect_state()` without an argument is a bug
332
+ . bisect: avoid double-quoting when printing the failed command
333
+ . bisect run: fix the error message
334
+ . bisect: verify that a bogus option won't try to start a bisection
335
+ . bisect--helper: migrate to OPT_SUBCOMMAND()
336
+ . bisect--helper: make the order consistently `argc, argv`
337
+ . bisect--helper: make `terms` an explicit singleton
338
+ . bisect--helper: simplify exit code computation
339
+ . bisect--helper: really retire `--bisect-autostart`
340
+ . bisect--helper: really retire --bisect-next-check
341
+ . bisect--helper: retire the --no-log option
342
+ . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
343
+
344
+ Final bits of "git bisect.sh" have been rewritten in C.
345
+
346
+ Needs review.
347
+ cf. <xmqqv8pr8903.fsf@gitster.g>
348
+ source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
349
+
350
+
351
+* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
352
+ . ci(main): linux32 uses actions/checkout@v2
353
+ . ci(main): upgrade actions/checkout to v3
354
+
355
+ Attempt to update GitHub CI to use actions/checkout@v3
356
+
357
+ Expecting a reroll.
358
+ Seems to break the CI completely.
359
+ source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
360
+
361
+
362
+* ed/fsmonitor-inotify (2022-10-14) 7 commits
363
+ . fsmonitor: update doc for Linux
364
+ . fsmonitor: test updates
365
+ . fsmonitor: enable fsmonitor for Linux
366
+ . fsmonitor: implement filesystem change listener for Linux
367
+ . fsmonitor: determine if filesystem is local or remote
368
+ . fsmonitor: prepare to share code between Mac OS and Linux
369
+ . Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
370
+
371
+ Bundled fsmonitor for Linux using inotify API.
372
+
373
+ Needs review.
374
+ Occasional breakages of t7527.16?
375
+ source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
376
+
377
+
378
+* ag/merge-strategies-in-c (2022-08-10) 14 commits
379
+ . sequencer: use the "octopus" strategy without forking
380
+ . sequencer: use the "resolve" strategy without forking
381
+ . merge: use the "octopus" strategy without forking
382
+ . merge: use the "resolve" strategy without forking
383
+ . merge-octopus: rewrite in C
384
+ . merge-recursive: move better_branch_name() to merge.c
385
+ . merge-resolve: rewrite in C
386
+ . merge-one-file: rewrite in C
387
+ . update-index: move add_cacheinfo() to read-cache.c
388
+ . merge-index: add a new way to invoke `git-merge-one-file'
389
+ . merge-index: drop the index
390
+ . merge-index: libify merge_one_path() and merge_all()
391
+ . t6060: add tests for removed files
392
+ . t6060: modify multiple files to expose a possible issue with merge-index
393
+
394
+ An attempt to rewrite remaining merge strategies from shell to C.
395
+
396
+ Needs more work.
397
+ At the minimum, we should lose 11/14 and possibly 08/14.
398
+ cf. <xmqq7d36vfur.fsf@gitster.g>
399
+ source: <20220809185429.20098-1-alban.gruin@gmail.com>
400
+
401
+
402
+* es/doc-creation-factor-fix (2022-07-28) 2 commits
403
+ . range-diff: clarify --creation-factor=<factor>
404
+ . format-patch: clarify --creation-factor=<factor>
405
+
406
+ Expecting a reroll by somebody more familiar with the logic
407
+ cf. <xmqqo7wfix7p.fsf@gitster.g>
408
+ source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
409
+
410
+
411
+* cw/remote-object-info (2022-08-13) 7 commits
412
+ . SQUASH???
413
+ . cat-file: add remote-object-info to batch-command
414
+ . transport: add client support for object-info
415
+ . serve: advertise object-info feature
416
+ . protocol-caps: initialization bug fix
417
+ . fetch-pack: move fetch initialization
418
+ . fetch-pack: refactor packet writing
419
+
420
+ A client component to talk with the object-info endpoint.
421
+
422
+ Expecting a reroll.
423
+ Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
424
+ cf. <20220728230210.2952731-1-calvinwan@google.com>
425
+ cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
426
+ source: <20220728230210.2952731-1-calvinwan@google.com>
427
+
428
+--------------------------------------------------
429
+[Cooking]
430
+
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
172
- (merged to 'next' on 2022-10-25 at 0d1b797119)
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()`
@@ -206,7 +492,7 @@ Release tarballs are available at:
492
493
494
* sg/stable-docdep (2022-10-21) 1 commit
209
- (merged to 'next' on 2022-10-25 at 83ecf487f3)
495
+ (merged to 'next' on 2022-10-26 at 68432e1b2c)
496
+ Documentation/build-docdep.perl: generate sorted output
497
498
Make sure generated dependency file is stably sorted to help
@@ -217,24 +503,25 @@ Release tarballs are available at:
503
504
505
* pb/subtree-split-and-merge-after-squashing-tag-fix (2022-10-21) 9 commits
220
- - subtree: fix split after annotated tag was squashed merged
221
- - subtree: fix squash merging after annotated tag was squashed merged
222
- - subtree: process 'git-subtree-split' trailer in separate function
223
- - subtree: use named variables instead of "$@" in cmd_pull
224
- - subtree: define a variable before its first use in 'find_latest_squash'
225
- - subtree: prefix die messages with 'fatal'
226
- - subtree: add 'die_incompatible_opt' function to reduce duplication
227
- - subtree: use 'git rev-parse --verify [--quiet]' for better error messages
228
- - test-lib-functions: mark 'test_commit' variables as 'local'
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'
516
517
A bugfix to "git subtree" in its split and merge features.
518
232
- Will merge to 'next'.
519
+ Will merge to 'master'.
520
source: <pull.1390.git.1666365219.gitgitgadget@gmail.com>
521
522
523
* jk/repack-tempfile-cleanup (2022-10-23) 6 commits
237
- (merged to 'next' on 2022-10-25 at 7e2d2f45d3)
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
@@ -250,29 +537,31 @@ Release tarballs are available at:
537
538
539
* en/ort-dir-rename-and-symlink-fix (2022-10-22) 1 commit
253
- - merge-ort: fix bug with dir rename vs change dir to symlink
540
+ (merged to 'next' on 2022-10-27 at 56f1e5222d)
541
+ + merge-ort: fix bug with dir rename vs change dir to symlink
542
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.
546
259
- Will merge to 'next'.
547
+ Will merge to 'master'.
548
source: <pull.1391.git.1666465450590.gitgitgadget@gmail.com>
549
550
551
* en/merge-tree-sequence (2022-10-22) 2 commits
264
- - merge-tree: support multiple batched merges with --stdin
265
- - merge-tree: update documentation for differences in -z output
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
555
556
"git merge-tree --stdin" is a new way to request a series of merges
557
and report the merge results.
558
270
- Will merge to 'next'?
559
+ Will merge to 'master'.
560
source: <pull.1361.git.1666488485.gitgitgadget@gmail.com>
561
562
563
* rs/absorb-git-dir-simplify (2022-10-23) 1 commit
275
- (merged to 'next' on 2022-10-25 at a5d6bc6667)
564
+ (merged to 'next' on 2022-10-26 at 3d23cfd399)
565
+ submodule: use strvec_pushf() for --super-prefix
566
567
Code simplification by using strvec_pushf() instead of building an
@@ -283,14 +572,15 @@ Release tarballs are available at:
572
573
574
* jc/doc-fsck-msgids (2022-10-25) 4 commits
286
- - Documentation: add lint-fsck-msgids
287
- - fsck: document msg-id
288
- - fsck: remove the unused MISSING_TREE_OBJECT
289
- - fsck: remove the unused BAD_TAG_OBJECT
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
580
581
Add documentation for message IDs in fsck error messages.
582
293
- Will merge to 'next'?
583
+ Will merge to 'master'.
584
source: <20221025224224.2352979-1-gitster@pobox.com>
585
586
@@ -319,11 +609,12 @@ Release tarballs are available at:
609
610
611
* tb/cap-patch-at-1gb (2022-10-25) 1 commit
322
- - apply: reject patches larger than ~1 GiB
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
326
- Will merge to 'next'.
617
+ Will merge to 'master'.
618
source: <70f5763834dff373a5573a99ec4cdfa36cadf34c.1666722251.git.me@ttaylorr.com>
619
620
@@ -338,139 +629,48 @@ Release tarballs are available at:
629
source: <bf36093cd6d7ac83b16241b0199b3a8c904e6774.1666722316.git.me@ttaylorr.com>
630
631
341
-* al/trace2-clearing-skip-worktree (2022-10-25) 1 commit
632
+* al/trace2-clearing-skip-worktree (2022-10-28) 2 commits
633
+ - SQUASH???
634
- index: add trace2 region for clear skip worktree
635
636
Add trace2 counters to the region to clear skip worktree bits in a
637
sparse checkout.
638
347
- Needs review.
348
- source: <pull.1368.git.git.1666742722502.gitgitgadget@gmail.com>
639
+ Expecting a reroll?
640
+ source: <pull.1368.v2.git.git.1666917961644.gitgitgadget@gmail.com>
641
642
643
* jt/skipping-negotiator-wo-recursion (2022-10-25) 1 commit
352
- - negotiator/skipping: avoid stack overflow
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
357
- Will merge to 'next'?
358
- source: <20221025232934.1504445-1-jonathantanmy@google.com>
359
-
360
-
361
-* rj/branch-copy-rename-error-codepath-cleanup (2022-10-25) 1 commit
362
- - branch: error copying or renaming a detached HEAD
363
-
364
- Code simplification.
365
-
366
- Will merge to 'next'.
367
- source: <0ac8cd48-08d7-9bdd-b074-c8d5ded522f6@gmail.com>
368
-
369
-
370
-* rj/branch-do-not-exit-with-minus-one-status (2022-10-25) 1 commit
371
- - branch: error code with --edit-description
372
-
373
- "git branch --edit-description" can exit with status -1 which is
374
- not a good practice; it learned to use 1 as everybody else instead.
375
-
376
- Will merge to 'next'.
377
- source: <b0f96b35-4e69-a889-bcdf-e0b40b89384f@gmail.com>
378
-
379
---------------------------------------------------
380
-[Stalled]
381
-
382
-* ag/merge-strategies-in-c (2022-08-10) 14 commits
383
- - sequencer: use the "octopus" strategy without forking
384
- - sequencer: use the "resolve" strategy without forking
385
- - merge: use the "octopus" strategy without forking
386
- - merge: use the "resolve" strategy without forking
387
- - merge-octopus: rewrite in C
388
- - merge-recursive: move better_branch_name() to merge.c
389
- - merge-resolve: rewrite in C
390
- - merge-one-file: rewrite in C
391
- - update-index: move add_cacheinfo() to read-cache.c
392
- - merge-index: add a new way to invoke `git-merge-one-file'
393
- - merge-index: drop the index
394
- - merge-index: libify merge_one_path() and merge_all()
395
- - t6060: add tests for removed files
396
- - t6060: modify multiple files to expose a possible issue with merge-index
397
-
398
- An attempt to rewrite remaining merge strategies from shell to C.
399
-
400
- Needs more work.
401
- At the minimum, we should lose 11/14 and possibly 08/14.
402
- cf. <xmqq7d36vfur.fsf@gitster.g>
403
- source: <20220809185429.20098-1-alban.gruin@gmail.com>
404
-
405
-
406
-* gc/submodule-clone-update-with-branches (2022-10-20) 7 commits
407
- - clone, submodule update: create and check out branches
408
- - submodule update: refactor update targets
409
- - submodule: return target of submodule symref
410
- - t5617: drop references to remote-tracking branches
411
- - submodule--helper clone: create named branch
412
- - repo-settings: add submodule_propagate_branches
413
- - clone: teach --detach option
414
-
415
- "git clone --recurse-submodules" and "git submodule update" learns
416
- to honor the "propagete branches" option.
417
- source: <pull.1321.v2.git.git.1666297238.gitgitgadget@gmail.com>
418
-
419
-
420
-* tb/diffstat-with-utf8-strwidth (2022-10-21) 2 commits
421
- (merged to 'next' on 2022-10-23 at 43a17bfeac)
422
- + diff: leave NEEDWORK notes in show_stats() function
423
- + diff.c: use utf8_strwidth() to count display width
424
-
425
- "git diff --stat" etc. were invented back when everything was ASCII
426
- and strlen() was a way to measure the display width of a string;
427
- adjust them to compute the display width assuming UTF-8 pathnames.
428
-
429
- Will merge to 'master'.
430
- source: <20220914151333.3309-1-tboegi@web.de>
431
-
432
-
433
-* es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits
434
- - config: let feature.experimental imply gc.cruftPacks=true
435
- - gc: add tests for --cruft and friends
436
-
437
- Enable gc.cruftpacks by default for those who opt into
438
- feature.experimental setting.
650
+ Will merge to 'master'.
651
+ source: <20221025232934.1504445-1-jonathantanmy@google.com>
652
440
- Expecting a reroll.
441
- cf. <220804.86a68ke9d5.gmgdl@evledraar.gmail.com>
442
- cf. <6803b725-526e-a1c8-f15c-a9ed4a144d4c@github.com>
443
- source: <20220803205721.3686361-1-emilyshaffer@google.com>
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
446
-* es/doc-creation-factor-fix (2022-07-28) 2 commits
447
- - range-diff: clarify --creation-factor=<factor>
448
- - format-patch: clarify --creation-factor=<factor>
658
+ Code simplification.
659
450
- Expecting a reroll by somebody more familiar with the logic
451
- cf. <xmqqo7wfix7p.fsf@gitster.g>
452
- source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
660
+ Will merge to 'master'.
661
+ source: <0ac8cd48-08d7-9bdd-b074-c8d5ded522f6@gmail.com>
662
663
455
-* cw/remote-object-info (2022-08-13) 7 commits
456
- . SQUASH???
457
- . cat-file: add remote-object-info to batch-command
458
- . transport: add client support for object-info
459
- . serve: advertise object-info feature
460
- . protocol-caps: initialization bug fix
461
- . fetch-pack: move fetch initialization
462
- . fetch-pack: refactor packet writing
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
464
- A client component to talk with the object-info endpoint.
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
466
- Expecting a reroll.
467
- Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
468
- cf. <20220728230210.2952731-1-calvinwan@google.com>
469
- cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
470
- source: <20220728230210.2952731-1-calvinwan@google.com>
671
+ Will merge to 'master'.
672
+ source: <b0f96b35-4e69-a889-bcdf-e0b40b89384f@gmail.com>
673
472
---------------------------------------------------
473
-[Cooking]
674
675
* po/glossary-around-traversal (2022-10-22) 3 commits
676
- glossary: add reachability bitmap description
@@ -499,96 +699,19 @@ Release tarballs are available at:
699
source: <pull.1352.v2.git.1666372083.gitgitgadget@gmail.com>
700
701
502
-* cw/submodule-status-in-parallel (2022-10-20) 7 commits
503
- . diff-lib: parallelize run_diff_files for submodules
504
- . diff-lib: refactor match_stat_with_submodule
505
- . submodule: move status parsing into function
506
- . submodule: strbuf variable rename
507
- . run-command: add hide_output to run_processes_parallel_opts
508
- . run-command: add pipe_output_fn to run_processes_parallel_opts
509
- . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
510
- (this branch uses ab/run-hook-api-cleanup.)
511
-
512
- Allow the internal "diff-files" engine to run "how has this
513
- submodule changed?" in parallel to speed up "git status".
514
-
515
- Breaks winVS test?
516
- cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092>
517
- source: <20221011232604.839941-1-calvinwan@google.com>
518
-
519
-
520
-* jk/unused-anno-more (2022-10-17) 12 commits
521
- (merged to 'next' on 2022-10-20 at 0e52ab6cf9)
522
- + ll-merge: mark unused parameters in callbacks
523
- + diffcore-pickaxe: mark unused parameters in pickaxe functions
524
- + convert: mark unused parameter in null stream filter
525
- + apply: mark unused parameters in noop error/warning routine
526
- + apply: mark unused parameters in handlers
527
- + date: mark unused parameters in handler functions
528
- + string-list: mark unused callback parameters
529
- + object-file: mark unused parameters in hash_unknown functions
530
- + mark unused parameters in trivial compat functions
531
- + update-index: drop unused argc from do_reupdate()
532
- + submodule--helper: drop unused argc from module_list_compute()
533
- + diffstat_consume(): assert non-zero length
534
-
535
- More UNUSED annotation to help using -Wunused option with the
536
- compiler.
537
-
538
- Will merge to 'master'.
539
- source: <Y036whEorZV0rOgB@coredump.intra.peff.net>
540
-
541
-
542
-* tb/save-keep-pack-during-geometric-repack (2022-10-17) 1 commit
543
- (merged to 'next' on 2022-10-20 at c88c17eb52)
544
- + repack: don't remove .keep packs with `--pack-kept-objects`
545
-
546
- When geometric repacking feature is in use together with the
547
- --pack-kept-objects option, we lost packs marked with .keep files.
548
-
549
- Will merge to 'master'.
550
- source: <6a012cd625c1d197ede91c85299cbfb37adf356b.1666059872.git.me@ttaylorr.com>
551
-
552
-
553
-* mm/git-pm-try-catch-syntax-fix (2022-10-22) 2 commits
554
- (merged to 'next' on 2022-10-23 at 011a23710f)
555
- + Git.pm: trust rev-parse to find bare repositories
556
- (merged to 'next' on 2022-10-21 at 7896738c3b)
557
- + Git.pm: add semicolon after catch statement
558
-
559
- Fix a longstanding syntax error in Git.pm error codepath.
560
-
561
- Will merge to 'master'.
562
- source: <20221016212236.12453-1-michael@mcclimon.org>
563
- source: <Y1Rdtog/XQV0YLj0@coredump.intra.peff.net>
564
-
565
-
702
* jr/embargoed-releases-doc (2022-10-24) 1 commit
567
- - embargoed releases: also describe the git-security list and the process
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
572
- Will merge to 'next'.
573
- source: <pull.1345.v4.git.1666649239302.gitgitgadget@gmail.com>
574
-
575
-
576
-* js/cmake-updates (2022-10-19) 5 commits
577
- (merged to 'next' on 2022-10-21 at 012ec675ba)
578
- + cmake: increase time-out for a long-running test
579
- + cmake: avoid editing t/test-lib.sh
580
- + add -p: avoid ambiguous signed/unsigned comparison
581
- + cmake: copy the merge tools for testing
582
- + cmake: make it easier to diagnose regressions in CTest runs
583
-
584
- Update to build procedure with VS using CMake/CTest.
585
-
709
Will merge to 'master'.
587
- source: <pull.1320.v3.git.1666090745.gitgitgadget@gmail.com>
710
+ source: <pull.1345.v4.git.1666649239302.gitgitgadget@gmail.com>
711
712
713
* jh/trace2-timers-and-counters (2022-10-24) 8 commits
591
- (merged to 'next' on 2022-10-25 at f8848f3e44)
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
@@ -605,40 +728,6 @@ Release tarballs are available at:
728
source: <pull.1373.v4.git.1666618868.gitgitgadget@gmail.com>
729
730
608
-* tb/midx-bitmap-selection-fix (2022-10-13) 4 commits
609
- (merged to 'next' on 2022-10-20 at b4d98bb5e4)
610
- + pack-bitmap-write.c: instrument number of reused bitmaps
611
- + midx.c: instrument MIDX and bitmap generation with trace2 regions
612
- + midx.c: consider annotated tags during bitmap selection
613
- + midx.c: fix whitespace typo
614
-
615
- A bugfix with tracing support in midx codepath
616
-
617
- Will merge to 'master'.
618
- source: <cover.1665612094.git.me@ttaylorr.com>
619
-
620
-
621
-* tb/remove-unused-pack-bitmap (2022-10-17) 1 commit
622
- (merged to 'next' on 2022-10-21 at ebb68add44)
623
- + builtin/repack.c: remove redundant pack-based bitmaps
624
-
625
- When creating a multi-pack bitmap, remove per-pack bitmap files
626
- unconditionally as they will never be consulted.
627
-
628
- Will merge to 'master'.
629
- source: <1e0ef7ee7ff5feb323c77e594cd65433fb1d99f7.1666061096.git.me@ttaylorr.com>
630
-
631
-
632
-* nw/t1002-cleanup (2022-10-14) 1 commit
633
- (merged to 'next' on 2022-10-20 at e6ae742fef)
634
- + t1002: modernize outdated conditional
635
-
636
- Code clean-up in test.
637
-
638
- Will merge to 'master'.
639
- source: <pull.1362.v3.git.git.1665734502591.gitgitgadget@gmail.com>
640
-
641
-
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
@@ -680,14 +769,15 @@ Release tarballs are available at:
769
770
771
* pw/rebase-keep-base-fixes (2022-10-17) 8 commits
683
- - rebase --keep-base: imply --no-fork-point
684
- - rebase --keep-base: imply --reapply-cherry-picks
685
- - rebase: factor out branch_base calculation
686
- - rebase: rename merge_base to branch_base
687
- - rebase: store orig_head as a commit
688
- - rebase: be stricter when reading state files containing oids
689
- - t3416: set $EDITOR in subshell
690
- - t3416: tighten two tests
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
@@ -697,54 +787,39 @@ Release tarballs are available at:
787
option now implies --reapply-cherry-picks and --no-fork-point
788
options.
789
700
- Will merge to 'next'.
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
705
- - rebase: cleanup action handling
706
- - rebase --abort: improve reflog message
707
- - rebase --apply: make reflog messages match rebase --merge
708
- - rebase --apply: respect GIT_REFLOG_ACTION
709
- - rebase --merge: fix reflog message after skipping
710
- - rebase --merge: fix reflog when continuing
711
- - t3406: rework rebase reflog tests
712
- - rebase --apply: remove duplicated code
713
- - Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
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
720
- Will merge to 'next'.
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
725
- (merged to 'next' on 2022-10-25 at d122052431)
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
732
-* ed/fsmonitor-inotify (2022-10-14) 7 commits
733
- . fsmonitor: update doc for Linux
734
- . fsmonitor: test updates
735
- . fsmonitor: enable fsmonitor for Linux
736
- . fsmonitor: implement filesystem change listener for Linux
737
- . fsmonitor: determine if filesystem is local or remote
738
- . fsmonitor: prepare to share code between Mac OS and Linux
739
- . Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
740
-
741
- Bundled fsmonitor for Linux using inotify API.
742
-
743
- Needs review.
744
- Occasional breakages of t7527.16?
745
- source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
746
-
747
-
823
* en/sparse-checkout-design (2022-10-08) 1 commit
824
- sparse-checkout.txt: new document with sparse-checkout directions
825
@@ -754,43 +829,6 @@ Release tarballs are available at:
829
source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>
830
831
757
-* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
758
- . ci(main): linux32 uses actions/checkout@v2
759
- . ci(main): upgrade actions/checkout to v3
760
-
761
- Attempt to update GitHub CI to use actions/checkout@v3
762
-
763
- Expecting a reroll.
764
- Seems to break the CI completely.
765
- source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
766
-
767
-
768
-* ab/run-hook-api-cleanup (2022-10-12) 15 commits
769
- (merged to 'next' on 2022-10-20 at 29ca8c34dc)
770
- + run-command.c: remove "max_processes", add "const" to signal() handler
771
- + run-command.c: pass "opts" further down, and use "opts->processes"
772
- + run-command.c: use "opts->processes", not "pp->max_processes"
773
- + run-command.c: don't copy "data" to "struct parallel_processes"
774
- + run-command.c: don't copy "ungroup" to "struct parallel_processes"
775
- + run-command.c: don't copy *_fn to "struct parallel_processes"
776
- + run-command.c: make "struct parallel_processes" const if possible
777
- + run-command API: move *_tr2() users to "run_processes_parallel()"
778
- + run-command API: have run_process_parallel() take an "opts" struct
779
- + run-command.c: use designated init for pp_init(), add "const"
780
- + run-command API: don't fall back on online_cpus()
781
- + run-command API: make "n" parameter a "size_t"
782
- + run-command tests: use "return", not "exit"
783
- + run-command API: have "run_processes_parallel{,_tr2}()" return void
784
- + run-command test helper: use "else if" pattern
785
- (this branch is used by cw/submodule-status-in-parallel.)
786
-
787
- Move a global variable added as a hack during regression fixes to
788
- its proper place in the API.
789
-
790
- Will merge to 'master'.
791
- source: <cover-v3-00.15-00000000000-20221012T205712Z-avarab@gmail.com>
792
-
793
-
832
* pw/test-todo (2022-10-06) 3 commits
833
- test_todo: allow [verbose] test as the command
834
- test_todo: allow [!] grep as the command
@@ -802,51 +840,6 @@ Release tarballs are available at:
840
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
841
842
805
-* ab/doc-synopsis-and-cmd-usage (2022-10-13) 34 commits
806
- (merged to 'next' on 2022-10-21 at c6d632ac1a)
807
- + tests: assert consistent whitespace in -h output
808
- + tests: start asserting that *.txt SYNOPSIS matches -h output
809
- + doc txt & -h consistency: make "worktree" consistent
810
- + worktree: define subcommand -h in terms of command -h
811
- + reflog doc: list real subcommands up-front
812
- + doc txt & -h consistency: make "commit" consistent
813
- + doc txt & -h consistency: make "diff-tree" consistent
814
- + doc txt & -h consistency: use "[<label>...]" for "zero or more"
815
- + doc txt & -h consistency: make "annotate" consistent
816
- + doc txt & -h consistency: make "stash" consistent
817
- + doc txt & -h consistency: add missing options
818
- + doc txt & -h consistency: use "git foo" form, not "git-foo"
819
- + doc txt & -h consistency: make "bundle" consistent
820
- + doc txt & -h consistency: make "read-tree" consistent
821
- + doc txt & -h consistency: make "rerere" consistent
822
- + doc txt & -h consistency: add missing options and labels
823
- + doc txt & -h consistency: make output order consistent
824
- + doc txt & -h consistency: add or fix optional "--" syntax
825
- + doc txt & -h consistency: fix mismatching labels
826
- + doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
827
- + doc txt & -h consistency: use "<options>", not "<options>..."
828
- + stash doc SYNOPSIS & -h: correct padding around "[]()"
829
- + doc txt & -h consistency: correct padding around "[]()"
830
- + doc txt & -h consistency: balance unbalanced "[" and "]"
831
- + doc txt & -h consistency: add "-z" to cat-file "-h"
832
- + doc txt & -h consistency: fix incorrect alternates syntax
833
- + doc txt & -h consistency: word-wrap
834
- + built-ins: consistently add "\n" between "usage" and options
835
- + doc SYNOPSIS: consistently use ' for commands
836
- + doc SYNOPSIS: don't use ' for subcommands
837
- + bundle: define subcommand -h in terms of command -h
838
- + builtin/bundle.c: indent with tabs
839
- + CodingGuidelines: update and clarify command-line conventions
840
- + tests: assert *.txt SYNOPSIS and -h output
841
-
842
- The short-help text shown by "git cmd -h" and the synopsis text
843
- shown at the beginning of "git help cmd" have been made more
844
- consistent.
845
-
846
- Will merge to 'master'.
847
- source: <cover-v5-00.34-00000000000-20221013T153625Z-avarab@gmail.com>
848
-
849
-
843
* ab/coccicheck-incremental (2022-10-26) 12 commits
844
- spatchcache: add a ccache-alike for "spatch"
845
- cocci: run against a generated ALL.cocci
@@ -869,49 +862,24 @@ Release tarballs are available at:
862
863
864
* ds/bundle-uri-3 (2022-10-12) 13 commits
872
- - bundle-uri: suppress stderr from remote-https
873
- - bundle-uri: quiet failed unbundlings
874
- - bundle: add flags to verify_bundle()
875
- - bundle-uri: fetch a list of bundles
876
- - bundle: properly clear all revision flags
877
- - bundle-uri: limit recursion depth for bundle lists
878
- - bundle-uri: parse bundle list in config format
879
- - bundle-uri: unit test "key=value" parsing
880
- - bundle-uri: create "key=value" line parsing
881
- - bundle-uri: create base key-value pair parsing
882
- - bundle-uri: create bundle_list struct and helpers
883
- - bundle-uri: use plain string in find_temp_filename()
884
- - Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3
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
890
- Will merge to 'next'?
884
+ Will merge to 'master'.
885
source: <pull.1333.v5.git.1665579160.gitgitgadget@gmail.com>
892
-
893
-
894
-* js/bisect-in-c (2022-08-30) 17 commits
895
- - bisect: no longer try to clean up left-over `.git/head-name` files
896
- - bisect: remove Cogito-related code
897
- - Turn `git bisect` into a full built-in
898
- - bisect: move even the command-line parsing to `bisect--helper`
899
- - bisect--helper: make `state` optional
900
- - bisect--helper: calling `bisect_state()` without an argument is a bug
901
- - bisect: avoid double-quoting when printing the failed command
902
- - bisect run: fix the error message
903
- - bisect: verify that a bogus option won't try to start a bisection
904
- - bisect--helper: migrate to OPT_SUBCOMMAND()
905
- - bisect--helper: make the order consistently `argc, argv`
906
- - bisect--helper: make `terms` an explicit singleton
907
- - bisect--helper: simplify exit code computation
908
- - bisect--helper: really retire `--bisect-autostart`
909
- - bisect--helper: really retire --bisect-next-check
910
- - bisect--helper: retire the --no-log option
911
- - Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
912
-
913
- Final bits of "git bisect.sh" have been rewritten in C.
914
-
915
- Needs review.
916
- cf. <xmqqv8pr8903.fsf@gitster.g>
917
- source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>