What's cooking (2022/04 #02)
Junio C Hamano committed
Apr 8, 2022 at 14:18 UTC
3e940371c48370f0e8f636802dcb206c4a41a5bd
1 file changed
+119
-340
whats-cooking.txt
+119
-340
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2022, #01; Mon, 4)
4
-X-master-at: faa21c10d44184f616d391c158dcbb13b9c72ef3
5
-X-next-at: 7b1312e21f5434e68922e4ff5aaf1a65af811c8e
3
+Subject: What's cooking in git.git (Apr 2022, #02; Fri, 8)
4
+X-master-at: ab1f2765f78e75ee51dface57e1071b3b7f42b09
5
+X-next-at: be66c8963cc046090ab0eb1f750e71f594a2a4e4
6
7
-What's cooking in git.git (Apr 2022, #01; Mon, 4)
7
+What's cooking in git.git (Apr 2022, #02; Fri, 8)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -18,6 +18,9 @@ useful"). Do not read too much into a topic being in (or not in)
18
'seen'. The ones marked with '.' do not appear in any of the
19
integration branches, but I am still holding onto them.
20
21
+I just tagged Git 2.36-rc1; thank you, everybody, who reported and
22
+fixed glitches in the -rc0 preview release.
23
+
24
Copies of the source code to Git live in many repositories, and the
25
following is a list of the ones I push into or their mirrors. Some
26
repositories have only a subset of branches.
@@ -47,372 +50,112 @@ Release tarballs are available at:
50
https://www.kernel.org/pub/software/scm/git/
51
52
--------------------------------------------------
50
-[New Topics]
53
+[Graduated to 'master']
54
52
-* ab/misc-cleanup (2022-04-01) 6 commits
53
- (merged to 'next' on 2022-04-04 at c5fb674865)
54
- + alloc.[ch]: remove alloc_report() function
55
- + object-store.h: remove unused has_sha1_file*()
56
- + pack-bitmap-write: remove unused bitmap_reset() function
57
- + xdiff/xmacros.h: remove unused XDL_PTRFREE
58
- + configure.ac: remove USE_PIC comment
59
- + run-command.h: remove always unused "clean_on_exit_handler_cbdata"
55
+* bc/csprng-mktemps (2022-04-06) 1 commit
56
+ (merged to 'next' on 2022-04-06 at 5510589561)
57
+ + git-compat-util: really support openssl as a source of entropy
58
61
- Code clean-up.
59
+ Build fix.
60
+ source: <20220405042826.56vyilttx3lo4scv@carlos-mbp.lan>
61
63
- Will merge to 'master'.
64
- source: <cover-v4-0.6-00000000000-20220331T014349Z-avarab@gmail.com>
62
63
+* ld/sparse-index-bash-completion (2022-04-08) 1 commit
64
+ - t9902: split test to run on appropriate systems
65
67
-* gf/shorthand-version-and-help (2022-03-31) 1 commit
68
- - cli: add -v and -h shorthands
66
+ Test regression fix.
67
+ source: <20220408095353.11183-1-adam@dinwoodie.org>
68
70
- "git -v" and "git -h" are now understood as "git --version" and
71
- "git --help".
69
+
70
+* tl/ls-tree-oid-only (2022-04-08) 1 commit
71
+ - ls-tree doc: document interaction with submodules
72
+
73
+ Docfix.
74
+ source: <patch-1.1-183b9639ae7-20220408T155704Z-avarab@gmail.com>
75
+
76
+--------------------------------------------------
77
+[New Topics]
78
+
79
+* ah/convert-warning-message (2022-04-08) 1 commit
80
+ - convert: clarify line ending conversion warning
81
+
82
+ Update a few end-user facing messages around eol conversion.
83
84
Will merge to 'next'?
74
- source: <20220331212709.36036-1-garrit@slashdev.space>
85
+ source: <20220408044154.9947-1-alexhenrie24@gmail.com>
86
87
77
-* ea/progress-partial-blame (2022-04-03) 1 commit
78
- - blame: report correct number of lines in progress when using ranges
88
+* cg/vscode-with-gdb (2022-04-08) 1 commit
89
+ - contrib/vscode/: debugging with VS Code and gdb
90
80
- The progress meter of "git blame" was showing incorrect numbers
81
- when processing only parts of the file.
91
+ VS code configuration updates.
92
93
Will merge to 'next'.
84
- source: <20220403165038.52803-1-eantoranz@gmail.com>
94
+ source: <20220407204001.112287-2-cogoni.guillaume@gmail.com>
95
86
---------------------------------------------------
87
-[Graduated to 'master']
96
89
-* ab/hook-tests-updates (2022-03-17) 13 commits
90
- (merged to 'next' on 2022-03-23 at 8c35279100)
91
- + http tests: use "test_hook" for "smart" and "dumb" http tests
92
- + proc-receive hook tests: use "test_hook" instead of "write_script"
93
- + tests: extend "test_hook" for "rm" and "chmod -x", convert "$HOOK"
94
- + tests: use "test_hook" for misc "mkdir -p" and "chmod" cases
95
- + tests: change "mkdir -p && write_script" to use "test_hook"
96
- + tests: change "cat && chmod +x" to use "test_hook"
97
- + gc + p4 tests: use "test_hook", remove sub-shells
98
- + fetch+push tests: use "test_hook" and "test_when_finished" pattern
99
- + bugreport tests: tighten up "git bugreport -s hooks" test
100
- + tests: assume the hooks are disabled by default
101
- + http tests: don't rely on "hook/post-update.sample"
102
- + hook tests: turn exit code assertions into a loop
103
- + test-lib-functions: add and use a "test_hook" wrapper
97
+* gf/unused-includes (2022-04-06) 2 commits
98
+ - apply.c: remove unnecessary include
99
+ - serve.c: remove unnecessary include
100
105
- Update tests around the use of hook scripts.
106
- source: <cover-v3-00.13-00000000000-20220317T100820Z-avarab@gmail.com>
101
+ Remove unused includes.
102
103
+ Will merge to 'next'?
104
+ source: <20220331194436.58005-1-garrit@slashdev.space>
105
109
-* ab/make-optim-noop (2022-03-21) 1 commit
110
- (merged to 'next' on 2022-03-23 at ea8e0bdc37)
111
- + Makefile: use ' ', not non-existing $(wspfx_SQ)
106
113
- A micro fix to a topic earlier merged to 'master'
114
- source: <patch-1.1-05949221e3f-20220319T002715Z-avarab@gmail.com>
107
+* km/t3501-use-test-helpers (2022-04-06) 1 commit
108
+ - t3501: remove test -f and stop ignoring git <cmd> exit code
109
110
+ Test script updates.
111
117
-* ab/racy-hooks (2022-03-23) 1 commit
118
- (merged to 'next' on 2022-03-24 at 7c7d902a7c)
119
- + hooks: fix "invoked hook" regression in a8cc5943338
112
+ Will merge to 'next'?
113
+ source: <20220405134742.17526-2-khalid.masum.92@gmail.com>
114
121
- Regression fix.
122
- source: <patch-1.1-d0c9b430b2c-20220321T230933Z-avarab@gmail.com>
115
116
+* pb/submodule-recurse-mode-enum (2022-04-06) 1 commit
117
+ - submodule.h: use a named enum for RECURSE_SUBMODULES_*
118
125
-* ab/reflog-parse-options (2022-03-28) 9 commits
126
- (merged to 'next' on 2022-03-29 at deb966122b)
127
- + reflog: fix 'show' subcommand's argv
128
- (merged to 'next' on 2022-03-25 at 1f18ebad35)
129
- + reflog [show]: display sensible -h output
130
- + reflog: convert to parse_options() API
131
- + reflog exists: use parse_options() API
132
- + git reflog [expire|delete]: make -h output consistent with SYNOPSIS
133
- + reflog: move "usage" variables and use macros
134
- + reflog tests: add missing "git reflog exists" tests
135
- + reflog: refactor cmd_reflog() to "if" branches
136
- + reflog.c: indent argument lists
119
+ Small code clean-up.
120
138
- "git reflog" command now uses parse-options API to parse its
139
- command line options.
140
- source: <cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com>
121
+ Will merge to 'next'?
122
+ source: <pull.1111.v2.git.1649092211419.gitgitgadget@gmail.com>
123
124
143
-* ab/reftable-aix-xlc-12 (2022-03-28) 1 commit
144
- (merged to 'next' on 2022-03-29 at 1d4f13e637)
145
- + reftable: make assignments portable to AIX xlc v12.01
125
+* rs/commit-summary-wo-break-rewrite (2022-04-06) 1 commit
126
+ - commit, sequencer: turn off break_opt for commit summary
127
147
- Work around AIX C compiler that does not seem to grok
148
- initialization of a union member of a struct.
149
- source: <patch-1.1-98267695418-20220328T190642Z-avarab@gmail.com>
128
+ The commit summary shown after making a commit is matched to what
129
+ is given in "git status" not to use the break-rewrite heuristics.
130
131
+ Will merge to 'next'?
132
+ source: <c35bd0aa-2e46-e710-2b39-89f18bad0097@web.de>
133
152
-* ab/test-tap-fix-for-immediate (2022-03-24) 1 commit
153
- (merged to 'next' on 2022-03-25 at 1b83c01d99)
154
- + test-lib: have --immediate emit valid TAP on failure
134
156
- Fix test framework a bit.
157
- source: <patch-1.1-47b236139e6-20220323T204410Z-avarab@gmail.com>
135
+* tk/p4-utf8-bom (2022-04-06) 1 commit
136
+ - git-p4: preserve utf8 BOM when importing from p4 to git
137
138
+ "git p4" update.
139
160
-* dp/worktree-repair-in-usage (2022-03-29) 1 commit
161
- (merged to 'next' on 2022-03-30 at 9bc0b72b96)
162
- + worktree: include repair cmd in usage
140
+ Will merge to 'next'?
141
+ source: <pull.1203.git.1649051436934.gitgitgadget@gmail.com>
142
164
- Usage string fix.
165
- source: <e0bfbfd5320edad29d20bef5e4eab2750bc3016c.1648500426.git.gitgitgadget@gmail.com>
143
144
+* tk/p4-with-explicity-sync (2022-04-06) 1 commit
145
+ - git-p4: support explicit sync of arbitrary existing git-p4 refs
146
168
-* ds/partial-bundle-more (2022-03-28) 6 commits
169
- (merged to 'next' on 2022-03-29 at fa892bdc2a)
170
- + pack-objects: lazily set up "struct rev_info", don't leak
171
- + bundle: output hash information in 'verify'
172
- + bundle: move capabilities to end of 'verify'
173
- + pack-objects: parse --filter directly into revs.filter
174
- + pack-objects: move revs out of get_object_list()
175
- + list-objects-filter: remove CL_ARG__FILTER
176
- (this branch is used by ab/plug-leak-in-revisions.)
147
+ "git p4" update.
148
+
149
+ Will merge to 'next'?
150
+ source: <pull.1202.git.1649049054600.gitgitgadget@gmail.com>
151
178
- Code clean-up.
179
- source: <pull.1186.git.1647970119.gitgitgadget@gmail.com>
180
-
181
-
182
-* ds/t7700-kept-pack-test (2022-03-25) 2 commits
183
- (merged to 'next' on 2022-03-29 at fb03a86974)
184
- + test-lib-functions: remove test_subcommand_inexact
185
- + t7700: check post-condition in kept-pack test
186
-
187
- Test clean-up.
188
- source: <pull.1185.v3.git.1648234967.gitgitgadget@gmail.com>
189
-
190
-
191
-* gc/branch-recurse-submodules-fix (2022-03-31) 7 commits
192
- (merged to 'next' on 2022-04-01 at 6cb0c300e4)
193
- + branch.c: simplify advice-and-die sequence
194
- + branch: rework comments for future developers
195
- + Merge branch 'ab/usage-die-message' into gc/branch-recurse-submodules-fix
196
- (merged to 'next' on 2022-03-30 at 7123078bae)
197
- + branch: remove negative exit code
198
- + branch --set-upstream-to: be consistent when advising
199
- + branch: give submodule updating advice before exit
200
- + branch: support more tracking modes when recursing
201
-
202
- A handful of obvious clean-ups around a topic that is already in
203
- 'master'.
204
- source: <pull.1190.git.1648584079.gitgitgadget@gmail.com>
205
-
206
-
207
-* gc/submodule-update-part2 (2022-03-16) 8 commits
208
- (merged to 'next' on 2022-03-29 at 17ffb55048)
209
- + submodule--helper: remove forward declaration
210
- + submodule: move core cmd_update() logic to C
211
- + submodule--helper: reduce logic in run_update_procedure()
212
- + submodule--helper: teach update_data more options
213
- + builtin/submodule--helper.c: rename option struct to "opt"
214
- + submodule update: use die_message()
215
- + submodule--helper: run update using child process struct
216
- + Merge branch 'gc/submodule-update-part1' into gc/submodule-update-part2
217
-
218
- Move more "git submodule update" to C.
219
- source: <20220315210925.79289-1-chooglen@google.com>
220
-
221
-
222
-* jc/coding-guidelines-decl-in-for-loop (2022-03-31) 1 commit
223
- (merged to 'next' on 2022-04-01 at aa0ea645b8)
224
- + CodingGuidelines: give deadline for "for (int i = 0; ..."
225
-
226
- Coding Guidelines clarification.
227
- source: <xmqqy20r3rv7.fsf@gitster.g>
228
-
229
-
230
-* jc/mailsplit-warn-on-tty (2022-03-03) 1 commit
231
- (merged to 'next' on 2022-04-01 at e2052fb920)
232
- + am/apply: warn if we end up reading patches from terminal
233
-
234
- "git am" can read from the standard input when no mailbox is given
235
- on the command line, but the end-user gets no indication when it
236
- happens, making Git appear stuck.
237
- source: <xmqqlexq8zqo.fsf@gitster.g>
238
-
239
-
240
-* jd/prompt-upstream-mark (2022-03-23) 4 commits
241
- (merged to 'next' on 2022-03-23 at 518404a091)
242
- + git-prompt: put upstream comments together
243
- + git-prompt: make long upstream state indicator consistent
244
- + git-prompt: make upstream state indicator location consistent
245
- + git-prompt: rename `upstream` to `upstream_type`
246
-
247
- Tweaks in the command line prompt (in contrib/) code around its
248
- GIT_PS1_SHOWUPSTREAM feature.
249
- source: <pull.1162.v2.git.1645991832.gitgitgadget@gmail.com>
250
-
251
-
252
-* jh/builtin-fsmonitor-part2 (2022-03-25) 30 commits
253
- (merged to 'next' on 2022-04-01 at 72cda55cde)
254
- + t7527: test status with untracked-cache and fsmonitor--daemon
255
- + fsmonitor: force update index after large responses
256
- + fsmonitor--daemon: use a cookie file to sync with file system
257
- + fsmonitor--daemon: periodically truncate list of modified files
258
- + t/perf/p7519: add fsmonitor--daemon test cases
259
- + t/perf/p7519: speed up test on Windows
260
- + t/perf/p7519: fix coding style
261
- + t/helper/test-chmtime: skip directories on Windows
262
- + t/perf: avoid copying builtin fsmonitor files into test repo
263
- + t7527: create test for fsmonitor--daemon
264
- + t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
265
- + help: include fsmonitor--daemon feature flag in version info
266
- + fsmonitor--daemon: implement handle_client callback
267
- + compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
268
- + compat/fsmonitor/fsm-listen-darwin: add MacOS header files for FSEvent
269
- + compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
270
- + fsmonitor--daemon: create token-based changed path cache
271
- + fsmonitor--daemon: define token-ids
272
- + fsmonitor--daemon: add pathname classification
273
- + fsmonitor--daemon: implement 'start' command
274
- + fsmonitor--daemon: implement 'run' command
275
- + compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
276
- + compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
277
- + fsmonitor--daemon: implement 'stop' and 'status' commands
278
- + fsmonitor--daemon: add a built-in fsmonitor daemon
279
- + fsmonitor: document builtin fsmonitor
280
- + fsmonitor: use IPC to query the builtin FSMonitor daemon
281
- + fsmonitor: config settings are repository-specific
282
- + fsmonitor-ipc: create client routines for git-fsmonitor--daemon
283
- + fsmonitor: enhance existing comments, clarify trivial response handling
284
- (this branch is used by jh/builtin-fsmonitor-part3.)
285
-
286
- Built-in fsmonitor (part 2).
287
- source: <pull.1041.v9.git.1648231393.gitgitgadget@gmail.com>
288
-
289
-
290
-* ns/core-fsyncmethod (2022-03-30) 2 commits
291
- (merged to 'next' on 2022-03-30 at 7280eb6f4e)
292
- + core.fsyncmethod: correctly camel-case warning message
293
- + core.fsync: fix incorrect expression for default configuration
294
- (this branch is used by ns/batch-fsync.)
295
-
296
- A couple of fix-up to a topic that is now in 'master'.
297
- source: <pull.1193.git.1648663716891.gitgitgadget@gmail.com>
298
-
299
-
300
-* ns/fsync-or-die-message-fix (2022-03-30) 1 commit
301
- (merged to 'next' on 2022-03-30 at 9de1909e71)
302
- + object-file: pass filename to fsync_or_die
303
-
304
- When creating a loose object file, we didn't report the exact
305
- filename of the file we failed to fsync, even though the
306
- information was readily available, which has been corrected.
307
- source: <pull.1194.git.1648664055986.gitgitgadget@gmail.com>
308
-
309
-
310
-* ns/trace2-fsync-stat (2022-03-30) 1 commit
311
- (merged to 'next' on 2022-03-30 at e7900f9b5a)
312
- + trace2: add stats for fsync operations
313
-
314
- Trace2 code has been taught to report stats for fsync operations.
315
- source: <pull.1192.git.1648616800529.gitgitgadget@gmail.com>
316
-
317
-
318
-* pw/add-p-single-key (2022-03-16) 5 commits
319
- (merged to 'next' on 2022-03-23 at a00396d9a1)
320
- + terminal: restore settings on SIGTSTP
321
- + terminal: work around macos poll() bug
322
- + terminal: don't assume stdin is /dev/tty
323
- + terminal: use flags for save_term()
324
- + Merge branch 'pw/single-key-interactive' into pw/add-p-single-key
325
-
326
- Finishing touches to C rewrite of "git add -i" in single-key
327
- interactive mode.
328
- source: <20220316185405.29551-5-phillip.wood123@gmail.com>
329
-
330
-
331
-* pw/worktree-list-with-z (2022-03-31) 1 commit
332
- (merged to 'next' on 2022-04-01 at 043549e5b0)
333
- + worktree: add -z option for list subcommand
334
-
335
- "git worktree list --porcelain" did not c-quote pathnames and lock
336
- reasons with unsafe bytes correctly, which is worked around by
337
- introducing NUL terminated output format with "-z".
338
- source: <pull.1164.v2.git.1648743688825.gitgitgadget@gmail.com>
339
-
340
-
341
-* rc/fetch-refetch (2022-03-28) 7 commits
342
- (merged to 'next' on 2022-04-01 at 5a994891e1)
343
- + docs: mention --refetch fetch option
344
- + fetch: after refetch, encourage auto gc repacking
345
- + t5615-partial-clone: add test for fetch --refetch
346
- + fetch: add --refetch option
347
- + builtin/fetch-pack: add --refetch option
348
- + fetch-pack: add refetch
349
- + fetch-negotiator: add specific noop initializer
350
-
351
- "git fetch --refetch" learned to fetch everything without telling
352
- the other side what we already have, which is useful when you
353
- cannot trust what you have in the local object store.
354
- source: <pull.1138.v4.git.1648476131.gitgitgadget@gmail.com>
355
-
356
-
357
-* tk/ambiguous-fetch-refspec (2022-04-01) 1 commit
358
- (merged to 'next' on 2022-04-01 at 2b55db0a4a)
359
- + tracking branches: add advice to ambiguous refspec error
360
-
361
- Give hint when branch tracking cannot be established because fetch
362
- refspecs from multiple remote repositories overlap.
363
- source: <pull.1183.v7.git.1648793113943.gitgitgadget@gmail.com>
364
-
365
-
366
-* tl/ls-tree-oid-only (2022-03-23) 15 commits
367
- (merged to 'next' on 2022-03-29 at cfa87a57e7)
368
- + ls-tree: split up "fast path" callbacks
369
- + ls-tree: detect and error on --name-only --name-status
370
- + ls-tree: support --object-only option for "git-ls-tree"
371
- + ls-tree: introduce "--format" option
372
- + cocci: allow padding with `strbuf_addf()`
373
- + ls-tree: introduce struct "show_tree_data"
374
- + ls-tree: slightly refactor `show_tree()`
375
- + ls-tree: fix "--name-only" and "--long" combined use bug
376
- + ls-tree: simplify nesting if/else logic in "show_tree()"
377
- + ls-tree: rename "retval" to "recurse" in "show_tree()"
378
- + ls-tree: use "size_t", not "int" for "struct strbuf"'s "len"
379
- + ls-tree: use "enum object_type", not {blob,tree,commit}_type
380
- + ls-tree: add missing braces to "else" arms
381
- + ls-tree: remove commented-out code
382
- + ls-tree tests: add tests for --name-status
383
-
384
- "git ls-tree" learns "--oid-only" option, similar to "--name-only",
385
- and more generalized "--format" option.
386
- source: <cover.1648026472.git.dyroneteng@gmail.com>
387
-
388
-
389
-* vd/mv-refresh-stat (2022-03-29) 1 commit
390
- (merged to 'next' on 2022-04-01 at b54225c97b)
391
- + mv: refresh stat info for moved entry
392
-
393
- "git mv" failed to refresh the cached stat information for the
394
- entry it moved.
395
- source: <pull.1187.v2.git.1648516027925.gitgitgadget@gmail.com>
396
-
397
-
398
-* vd/stash-silence-reset (2022-03-24) 9 commits
399
- (merged to 'next' on 2022-03-24 at 94218f2a5f)
400
- + reset: show --no-refresh in the short-help
401
- (merged to 'next' on 2022-03-23 at 932f4f6529)
402
- + reset: remove 'reset.refresh' config option
403
- + reset: remove 'reset.quiet' config option
404
- + reset: do not make '--quiet' disable index refresh
405
- (merged to 'next' on 2022-03-17 at c469159b61)
406
- + stash: make internal resets quiet and refresh index
407
- + reset: suppress '--no-refresh' advice if logging is silenced
408
- + reset: replace '--quiet' with '--no-refresh' in performance advice
409
- + reset: introduce --[no-]refresh option to --mixed
410
- + reset: revise index refresh advice
411
-
412
- "git stash" does not allow subcommands it internally runs as its
413
- implementation detail, except for "git reset", to emit messages;
414
- now "git reset" part has also been squelched.
415
- source: <pull.1170.v3.git.1647308982.gitgitgadget@gmail.com>
152
+
153
+* ab/env-array (2022-04-06) 3 commits
154
+ - run-command API users: use "env" not "env_array" in comments & names
155
+ - run-command API: rename "env_array" to "env"
156
+ - cocci: add a rename of "struct child_process"'s "env_array" to "env"
157
+
158
+ source: <cover-0.3-00000000000-20220406T104134Z-avarab@gmail.com>
159
160
--------------------------------------------------
161
[Stalled]
@@ -455,10 +198,45 @@ Release tarballs are available at:
198
Expecting a reroll.
199
source: <20220328191112.3092139-1-calvinwan@google.com>
200
458
-
201
--------------------------------------------------
202
[Cooking]
203
204
+* ab/misc-cleanup (2022-04-01) 6 commits
205
+ (merged to 'next' on 2022-04-04 at c5fb674865)
206
+ + alloc.[ch]: remove alloc_report() function
207
+ + object-store.h: remove unused has_sha1_file*()
208
+ + pack-bitmap-write: remove unused bitmap_reset() function
209
+ + xdiff/xmacros.h: remove unused XDL_PTRFREE
210
+ + configure.ac: remove USE_PIC comment
211
+ + run-command.h: remove always unused "clean_on_exit_handler_cbdata"
212
+
213
+ Code clean-up.
214
+
215
+ Will cook in 'next'.
216
+ source: <cover-v4-0.6-00000000000-20220331T014349Z-avarab@gmail.com>
217
+
218
+
219
+* gf/shorthand-version-and-help (2022-03-31) 1 commit
220
+ - cli: add -v and -h shorthands
221
+
222
+ "git -v" and "git -h" are now understood as "git --version" and
223
+ "git --help".
224
+
225
+ Will merge to 'next'?
226
+ source: <20220331212709.36036-1-garrit@slashdev.space>
227
+
228
+
229
+* ea/progress-partial-blame (2022-04-06) 1 commit
230
+ (merged to 'next' on 2022-04-07 at 7df8392d71)
231
+ + blame: report correct number of lines in progress when using ranges
232
+
233
+ The progress meter of "git blame" was showing incorrect numbers
234
+ when processing only parts of the file.
235
+
236
+ Will cook in 'next'.
237
+ source: <20220406181320.16911-1-eantoranz@gmail.com>
238
+
239
+
240
* ab/plug-leak-in-revisions (2022-04-03) 28 commits
241
- revisions API: add a TODO for diff_free(&revs->diffopt)
242
- revisions API: have release_revisions() release "topo_walk_info"
@@ -549,7 +327,9 @@ Release tarballs are available at:
327
* kf/p4-multiple-remotes (2022-03-21) 1 commit
328
- git-p4: fix issue with multiple perforce remotes
329
552
- Needs review.
330
+ "git p4" update.
331
+
332
+ Will merge to 'next'?
333
source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>
334
335
@@ -563,7 +343,7 @@ Release tarballs are available at:
343
Reimplement "vimdiff[123]" mergetool drivers with a more generic
344
layout mechanism.
345
566
- Will merge to 'master'.
346
+ Will cook in 'next'.
347
source: <20220330191909.294610-1-greenfoo@u92.eu>
348
349
@@ -580,7 +360,7 @@ Release tarballs are available at:
360
source: <20220403182250.904933-1-sandals@crustytoothpaste.net>
361
362
583
-* ns/batch-fsync (2022-03-30) 14 commits
363
+* ns/batch-fsync (2022-04-06) 13 commits
364
- core.fsyncmethod: performance tests for batch mode
365
- t/perf: add iteration setup mechanism to perf-lib
366
- core.fsyncmethod: tests for batch mode
@@ -591,7 +371,6 @@ Release tarballs are available at:
371
- builtin/add: add ODB transaction around add_files_to_cache
372
- cache-tree: use ODB transaction around writing a tree
373
- core.fsyncmethod: batched disk flushes for loose-objects
594
- - object-file: pass filename to fsync_or_die
374
- bulk-checkin: rebrand plug/unplug APIs as 'odb transactions'
375
- bulk-checkin: rename 'state' variable and separate 'plugged' boolean
376
- Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync
@@ -707,7 +486,7 @@ Release tarballs are available at:
486
when "--untracked-files=<mode>" and "status.showUntrackedFiles"
487
are combined.
488
710
- Will merge to 'master'.
489
+ Will cook in 'next'.
490
source: <pull.985.v6.git.1648742535.gitgitgadget@gmail.com>
491
492
@@ -846,7 +625,7 @@ Release tarballs are available at:
625
626
Various cleanups to "git p4".
627
849
- Will merge to 'master'.
628
+ Will cook in 'next'.
629
source: <20220401142504.58995-1-jholdsworth@nvidia.com>
630
631