What's cooking (2021/09 #09)
Junio C Hamano committed
Sep 30, 2021 at 15:53 UTC
41f1695ffe1b136d0a5af4d491ecaea3be4dec00
1 file changed
+368
-244
whats-cooking.txt
+368
-244
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2021, #08; Mon, 27)
4
-X-master-at: ddb1055343948e0d0bc81f8d20245f1ada6430a0
5
-X-next-at: 4c38ced6901a8523cea197b31b2616240ec9fb6e
3
+Subject: What's cooking in git.git (Sep 2021, #09; Thu, 30)
4
+X-master-at: cefe983a320c03d7843ac78e73bd513a27806845
5
+X-next-at: 93a45727a2bf02ed8222a19bc9fdad4616d68eed
6
7
-What's cooking in git.git (Sep 2021, #08; Mon, 27)
7
+What's cooking in git.git (Sep 2021, #09; Thu, 30)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -18,8 +18,6 @@ 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
-
22
-
21
Copies of the source code to Git live in many repositories, and the
22
following is a list of the ones I push into or their mirrors. Some
23
repositories have only a subset of branches.
@@ -48,115 +46,181 @@ Release tarballs are available at:
46
47
https://www.kernel.org/pub/software/scm/git/
48
49
+--------------------------------------------------
50
+[Graduated to 'master']
51
+
52
+* cb/unicode-14 (2021-09-17) 1 commit
53
+ (merged to 'next' on 2021-09-20 at 7873b310ad)
54
+ + unicode: update the width tables to Unicode 14
55
+
56
+ The unicode character width table (used for output alignment) has
57
+ been updated.
58
+
59
+
60
+* en/typofixes (2021-09-20) 2 commits
61
+ (merged to 'next' on 2021-09-20 at 48648dafa3)
62
+ + merge-ort: fix completely wrong comment
63
+ + trace2.h: fix trivial comment typo
64
+
65
+ Typofixes.
66
+
67
+
68
+* jk/reduce-malloc-in-v2-servers (2021-09-15) 12 commits
69
+ (merged to 'next' on 2021-09-16 at 40cfe41efc)
70
+ + ls-refs: reject unknown arguments
71
+ + serve: reject commands used as capabilities
72
+ + serve: reject bogus v2 "command=ls-refs=foo"
73
+ + docs/protocol-v2: clarify some ls-refs ref-prefix details
74
+ + ls-refs: ignore very long ref-prefix counts
75
+ + serve: drop "keys" strvec
76
+ + serve: provide "receive" function for session-id capability
77
+ + serve: provide "receive" function for object-format capability
78
+ + serve: add "receive" method for v2 capabilities table
79
+ + serve: return capability "value" from get_capability()
80
+ + serve: rename is_command() to parse_command()
81
+ + Merge branch 'ab/serve-cleanup' into jk/reduce-malloc-in-v2-servers
82
+
83
+ Code cleanup to limit memory consumption and tighten protocol
84
+ message parsing.
85
+
86
--------------------------------------------------
87
[New Topics]
88
54
-* ab/bundle-remove-verbose-option (2021-09-23) 1 commit
55
- - bundle: remove ignored & undocumented "--verbose" flag
89
+* ab/designated-initializers (2021-09-27) 5 commits
90
+ - cbtree.h: define cb_init() in terms of CBTREE_INIT
91
+ - *.h: move some *_INIT to designated initializers
92
+ - *.h _INIT macros: don't specify fields equal to 0
93
+ - *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom
94
+ - submodule-config.h: remove unused SUBMODULE_INIT macro
95
+ (this branch is used by ab/designated-initializers-more.)
96
57
- Doc update.
97
+ Code clean-up.
98
99
Will merge to 'next'.
100
101
62
-* ab/config-based-hooks-1 (2021-09-27) 8 commits
63
- - hook-list.h: add a generated list of hooks, like config-list.h
64
- - hook.c users: use "hook_exists()" instead of "find_hook()"
65
- - hook.c: add a hook_exists() wrapper and use it in bugreport.c
66
- - hook.[ch]: move find_hook() from run-command.c to hook.c
67
- - Makefile: remove an out-of-date comment
68
- - Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
69
- - Makefile: stop hardcoding {command,config}-list.h
70
- - Makefile: mark "check" target as .PHONY
102
+* ab/designated-initializers-more (2021-09-27) 6 commits
103
+ - builtin/remote.c: add and use SHOW_INFO_INIT
104
+ - builtin/remote.c: add and use a REF_STATES_INIT
105
+ - urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT
106
+ - builtin/blame.c: refactor commit_info_init() to COMMIT_INFO_INIT macro
107
+ - daemon.c: refactor hostinfo_init() to HOSTINFO_INIT macro
108
+ - Merge branch 'ab/designated-initializers' into ab/designated-initializers-more
109
+ (this branch uses ab/designated-initializers.)
110
111
+ Code clean-up.
112
73
-* ab/http-pinned-public-key-mismatch (2021-09-27) 1 commit
74
- - http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors
113
+ What's the status of this one? Meh?
114
76
- HTTPS error handling updates.
115
78
- Will merge to 'next'?
116
+* lh/systemd-timers (2021-09-27) 1 commit
117
+ - maintenance: fix test t7900-maintenance.sh
118
119
+ Testfix.
120
81
-* ab/make-compdb-fix (2021-09-27) 1 commit
82
- - Makefile: pass -Wno-pendantic under GENERATE_COMPILATION_DATABASE=yes
121
+ Will merge to 'next'.
122
84
- Build update.
123
+
124
+* os/status-docfix (2021-09-28) 1 commit
125
+ - doc: fix capitalization in "git status --porcelain=v2" description
126
+
127
+ Docfix.
128
129
Will merge to 'next'.
130
131
89
-* jk/ref-paranoia (2021-09-27) 16 commits
90
- - refs: drop "broken" flag from for_each_fullref_in()
91
- - ref-filter: drop broken-ref code entirely
92
- - ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
93
- - repack, prune: drop GIT_REF_PARANOIA settings
94
- - refs: turn on GIT_REF_PARANOIA by default
95
- - refs: omit dangling symrefs when using GIT_REF_PARANOIA
96
- - refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
97
- - refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
98
- - refs-internal.h: move DO_FOR_EACH_* flags next to each other
99
- - t5312: be more assertive about command failure
100
- - t5312: test non-destructive repack
101
- - t5312: create bogus ref as necessary
102
- - t5312: drop "verbose" helper
103
- - t5600: provide detached HEAD for corruption failures
104
- - t5516: don't use HEAD ref for invalid ref-deletion tests
105
- - t7900: clean up some more broken refs
132
+* ab/parse-options-cleanup (2021-09-28) 10 commits
133
+ - parse-options: change OPT_{SHORT,UNSET} to an enum
134
+ - parse-options tests: test optname() output
135
+ - parse-options.[ch]: make opt{bug,name}() "static"
136
+ - commit-graph: stop using optname()
137
+ - parse-options.c: move optname() earlier in the file
138
+ - parse-options.h: make the "flags" in "struct option" an enum
139
+ - parse-options.c: use exhaustive "case" arms for "enum parse_opt_type"
140
+ - parse-options.[ch]: consistently use "enum parse_opt_result"
141
+ - parse-options.[ch]: consistently use "enum parse_opt_flags"
142
+ - parse-options.h: move PARSE_OPT_SHELL_EVAL between enums
143
107
- The ref iteration code used to optionally allow dangling refs to be
108
- shown, which has been tightened up.
144
+ Random changes to parse-options implementation.
145
110
- Will merge to 'next'?
146
+ What's the status of this one? Meh?
147
148
113
-* pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
114
- - rebase: fix todo-list rereading
115
- - sequencer.c: factor out a function
149
+* ab/retire-git-config-key-is-valid (2021-09-28) 1 commit
150
+ - config.c: remove unused git_config_key_is_valid()
151
117
- The code to re-read the edited todo list in "git rebase -i" was
118
- made more robust.
152
+ Code cleanup.
153
154
Will merge to 'next'.
155
156
123
-* rs/close-pack-leakfix (2021-09-24) 1 commit
124
- - packfile: release bad_objects in close_pack()
157
+* ab/retire-refs-unused-funcs (2021-09-28) 5 commits
158
+ - refs/ref-cache.[ch]: remove "incomplete" from create_dir_entry()
159
+ - refs/ref-cache.c: remove "mkdir" parameter from find_containing_dir()
160
+ - refs/ref-cache.[ch]: remove unused add_ref_entry()
161
+ - refs/ref-cache.[ch]: remove unused remove_entry_from_dir()
162
+ - refs.[ch]: remove unused ref_storage_backend_exists()
163
126
- Leakfix.
164
+ Code cleanup.
165
+
166
+ Will merge to 'next'.
167
+
168
+
169
+* ab/retire-string-list-init (2021-09-28) 1 commit
170
+ - string-list.[ch]: remove string_list_init() compatibility function
171
+
172
+ Code cleanup.
173
+
174
+ Will merge to 'next'.
175
+
176
+
177
+* mt/grep-submodule-textconv (2021-09-29) 1 commit
178
+ - grep: demonstrate bug with textconv attributes and submodules
179
+
180
+ "git grep --recurse-submodules" takes trees and blobs from the
181
+ submodule repository, but the textconv settings when processing a
182
+ blob from the submodule is not taken from the submodule repository.
183
+ A demonstration is added to demonstrate the issue, without fixing
184
+ it.
185
186
Will merge to 'next'.
187
188
--------------------------------------------------
189
[Stalled]
190
133
-* ab/pack-objects-stdin (2021-07-09) 5 commits
134
- - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
135
- - pack-objects.c: do stdin parsing via revision.c's API
136
- - revision.[ch]: add a "handle_stdin_line" API
137
- - revision.h: refactor "disable_stdin" and "read_from_stdin"
138
- - upload-pack: run is_repository_shallow() before setup_revisions()
191
+* ar/submodule-update (2021-09-20) 8 commits
192
+ . submodule--helper: rename helper functions
193
+ . submodule--helper: remove unused helpers
194
+ . submodule--helper: remove update-clone subcommand
195
+ . submodule: move core cmd_update() logic to C
196
+ . submodule--helper: refactor get_submodule_displaypath()
197
+ . submodule--helper: rename helpers for update-clone
198
+ . submodule--helper: get remote names from any repository
199
+ . submodule--helper: split up ensure_core_worktree()
200
140
- Introduce handle_stdin_line callback to revision API and uses it.
201
+ Rewrite of "git submodule update" in C.
202
142
- Expecting a reroll.
203
+ Kicked out of 'seen' to make room for es/superproject-aware-submodules
204
+ which is among the topics this topic stomps on.
205
206
+--------------------------------------------------
207
+[Cooking]
208
209
* es/superproject-aware-submodules (2021-08-19) 5 commits
146
- . fixup! introduce submodule.superprojectGitDir record
147
- . submodule: record superproject gitdir during 'update'
148
- . submodule: record superproject gitdir during absorbgitdirs
149
- . introduce submodule.superprojectGitDir record
150
- . t7400-submodule-basic: modernize inspect() helper
210
+ - fixup! introduce submodule.superprojectGitDir record
211
+ - submodule: record superproject gitdir during 'update'
212
+ - submodule: record superproject gitdir during absorbgitdirs
213
+ - introduce submodule.superprojectGitDir record
214
+ - t7400-submodule-basic: modernize inspect() helper
215
216
A configuration variable in a submodule points at the location of
217
the superproject it is bound to (RFC).
218
155
- Kicked out of 'seen' tentatively to see how well a conflicting
156
- ar/submodule-update topic fares.
219
+ Brought back to 'seen' to see if it still plays well with the rest
220
+ of 'seen', without the conflicting ar/submodule-update topic.
221
222
159
-* ab/fsck-unexpected-type (2021-09-22) 17 commits
223
+* ab/fsck-unexpected-type (2021-09-30) 17 commits
224
- fsck: report invalid object type-path combinations
225
- fsck: don't hard die on invalid object types
226
- object-file.c: stop dying in parse_loose_header()
@@ -178,68 +242,157 @@ Release tarballs are available at:
242
"git fsck" has been taught to report mismatch between expected and
243
actual types of an object better.
244
181
- Needs review.
245
+ Will merge to 'next'?
246
+
247
+
248
+* ab/bundle-remove-verbose-option (2021-09-23) 1 commit
249
+ (merged to 'next' on 2021-09-28 at 8251d269a2)
250
+ + bundle: remove ignored & undocumented "--verbose" flag
251
+
252
+ Doc update.
253
+
254
+ Will merge to 'master'.
255
+
256
+
257
+* ab/config-based-hooks-1 (2021-09-27) 8 commits
258
+ - hook-list.h: add a generated list of hooks, like config-list.h
259
+ - hook.c users: use "hook_exists()" instead of "find_hook()"
260
+ - hook.c: add a hook_exists() wrapper and use it in bugreport.c
261
+ - hook.[ch]: move find_hook() from run-command.c to hook.c
262
+ - Makefile: remove an out-of-date comment
263
+ - Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
264
+ - Makefile: stop hardcoding {command,config}-list.h
265
+ - Makefile: mark "check" target as .PHONY
266
+
267
+ Mostly preliminary clean-up in the hook API.
268
+
269
+
270
+* ab/http-pinned-public-key-mismatch (2021-09-27) 1 commit
271
+ - http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors
272
+
273
+ HTTPS error handling updates.
274
+
275
+ Will merge to 'next'.
276
+
277
+
278
+* ab/make-compdb-fix (2021-09-27) 1 commit
279
+ (merged to 'next' on 2021-09-29 at b3439753df)
280
+ + Makefile: pass -Wno-pendantic under GENERATE_COMPILATION_DATABASE=yes
281
+
282
+ Build update.
283
+
284
+ Will merge to 'master'.
285
+
286
+
287
+* jk/ref-paranoia (2021-09-27) 16 commits
288
+ - refs: drop "broken" flag from for_each_fullref_in()
289
+ - ref-filter: drop broken-ref code entirely
290
+ - ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
291
+ - repack, prune: drop GIT_REF_PARANOIA settings
292
+ - refs: turn on GIT_REF_PARANOIA by default
293
+ - refs: omit dangling symrefs when using GIT_REF_PARANOIA
294
+ - refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
295
+ - refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
296
+ - refs-internal.h: move DO_FOR_EACH_* flags next to each other
297
+ - t5312: be more assertive about command failure
298
+ - t5312: test non-destructive repack
299
+ - t5312: create bogus ref as necessary
300
+ - t5312: drop "verbose" helper
301
+ - t5600: provide detached HEAD for corruption failures
302
+ - t5516: don't use HEAD ref for invalid ref-deletion tests
303
+ - t7900: clean up some more broken refs
304
+ (this branch is used by jt/no-abuse-alternate-odb-for-submodules.)
305
+
306
+ The ref iteration code used to optionally allow dangling refs to be
307
+ shown, which has been tightened up.
308
+
309
+ Will merge to 'next'.
310
+
311
+
312
+* pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
313
+ (merged to 'next' on 2021-09-28 at c67d5e383e)
314
+ + rebase: fix todo-list rereading
315
+ + sequencer.c: factor out a function
316
+
317
+ The code to re-read the edited todo list in "git rebase -i" was
318
+ made more robust.
319
+
320
+ Will merge to 'master'.
321
+
322
+
323
+* rs/close-pack-leakfix (2021-09-24) 1 commit
324
+ (merged to 'next' on 2021-09-28 at b14502faa0)
325
+ + packfile: release bad_objects in close_pack()
326
+
327
+ Leakfix.
328
+
329
+ Will merge to 'master'.
330
183
---------------------------------------------------
184
-[Cooking]
331
332
* ab/make-clean-depend-dirs (2021-09-22) 1 commit
187
- - Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
333
+ (merged to 'next' on 2021-09-28 at 20483ade7d)
334
+ + Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
335
336
"make clean" has been updated to remove leftover .depend/
337
directories, even when it is not told to use them to compute header
338
dependencies.
339
193
- Will merge to 'next'.
340
+ Will merge to 'master'.
341
342
343
* bs/ls-files-opt-help-text-update (2021-09-22) 1 commit
197
- - ls-files: use imperative mood for -X and -z option description
344
+ (merged to 'next' on 2021-09-28 at d27c228644)
345
+ + ls-files: use imperative mood for -X and -z option description
346
199
- Help test for "ls-files" options have been updated.
347
+ Help text for "ls-files" options have been updated.
348
201
- Will merge to 'next'.
349
+ Will merge to 'master'.
350
351
352
* ds/perf-test-built-path-fix (2021-09-22) 1 commit
205
- - t/perf/run: fix bin-wrappers computation
353
+ (merged to 'next' on 2021-09-28 at 18a21483d9)
354
+ + t/perf/run: fix bin-wrappers computation
355
356
Perf test fix.
357
209
- Will merge to 'next'.
358
+ Will merge to 'master'.
359
360
361
* gc/doc-first-contribution-reroll (2021-09-22) 1 commit
213
- - MyFirstContribution: Document --range-diff option when writing v2
362
+ (merged to 'next' on 2021-09-29 at b7dea55eae)
363
+ + MyFirstContribution: Document --range-diff option when writing v2
364
365
Doc update.
366
217
- Will merge to 'next'.
367
+ Will merge to 'master'.
368
369
370
* jk/grep-haystack-is-read-only (2021-09-22) 5 commits
221
- - grep: store grep_source buffer as const
222
- - grep: mark "haystack" buffers as const
223
- - grep: stop modifying buffer in grep_source_1()
224
- - grep: stop modifying buffer in show_line()
225
- - grep: stop modifying buffer in strip_timestamp
371
+ (merged to 'next' on 2021-09-28 at 1660a6be89)
372
+ + grep: store grep_source buffer as const
373
+ + grep: mark "haystack" buffers as const
374
+ + grep: stop modifying buffer in grep_source_1()
375
+ + grep: stop modifying buffer in show_line()
376
+ + grep: stop modifying buffer in strip_timestamp
377
(this branch is used by hm/paint-hits-in-log-grep.)
378
379
Code clean-up in the "grep" machinery.
380
230
- Will merge to 'next'.
381
+ Will merge to 'master'.
382
383
384
* jk/http-redact-fix (2021-09-22) 1 commit
234
- - http: match headers case-insensitively when redacting
385
+ (merged to 'next' on 2021-09-28 at ef4570a5d1)
386
+ + http: match headers case-insensitively when redacting
387
388
Sensitive data in the HTTP trace were supposed to be redacted, but
389
we failed to do so in HTTP/2 requests.
390
239
- Will merge to 'next'.
391
+ Will merge to 'master'.
392
393
242
-* js/win-lazyload-buildfix (2021-09-27) 2 commits
394
+* js/win-lazyload-buildfix (2021-09-28) 3 commits
395
+ - Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better
396
- lazyload.h: use an even more generic function pointer than FARPROC
397
- lazyload.h: fix warnings about mismatching function pointer types
398
@@ -249,11 +402,12 @@ Release tarballs are available at:
402
403
404
* ab/auto-depend-with-pedantic (2021-09-22) 1 commit
252
- - Makefile: make COMPUTE_HEADER_DEPENDENCIES=auto work with DEVOPTS=pedantic
405
+ (merged to 'next' on 2021-09-28 at 532f2aa26e)
406
+ + Makefile: make COMPUTE_HEADER_DEPENDENCIES=auto work with DEVOPTS=pedantic
407
408
Improve build procedure for developers.
409
256
- Will merge to 'next'.
410
+ Will merge to 'master'.
411
412
413
* ab/make-sparse-for-real (2021-09-22) 1 commit
@@ -266,40 +420,39 @@ Release tarballs are available at:
420
421
422
* bs/difftool-msg-tweak (2021-09-22) 1 commit
269
- - difftool: fix word spacing in the usage strings
423
+ (merged to 'next' on 2021-09-29 at 22d485e560)
424
+ + difftool: fix word spacing in the usage strings
425
426
Message tweak.
427
273
- Will merge to 'next'.
428
+ Will merge to 'master'.
429
430
431
* ew/midx-doc-update (2021-09-24) 1 commit
277
- - doc/technical: update note about core.multiPackIndex
432
+ (merged to 'next' on 2021-09-28 at f2cbe598eb)
433
+ + doc/technical: update note about core.multiPackIndex
434
435
Doc tweak.
436
281
- Will merge to 'next'.
437
+ Will merge to 'master'.
438
439
284
-* jt/no-abuse-alternate-odb-for-submodules (2021-09-22) 10 commits
285
- . submodule: trace adding submodule ODB as alternate
286
- . refs: change refs_for_each_ref_in() to take repo
287
- . submodule: pass repo to check_has_commit()
288
- . object-file: only register submodule ODB if needed
289
- . merge-{ort,recursive}: remove add_submodule_odb()
290
- . refs: teach refs_for_each_ref() arbitrary repos
291
- . refs iterator: support non-the_repository advance
292
- . refs: add repo paramater to _iterator_peel()
293
- . refs: make _advance() check struct repo, not flag
294
- . Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
295
- (this branch uses jt/add-submodule-odb-clean-up.)
440
+* jt/no-abuse-alternate-odb-for-submodules (2021-09-29) 9 commits
441
+ - submodule: trace adding submodule ODB as alternate
442
+ - submodule: pass repo to check_has_commit()
443
+ - object-file: only register submodule ODB if needed
444
+ - merge-{ort,recursive}: remove add_submodule_odb()
445
+ - refs: peeling non-the_repository iterators is BUG
446
+ - refs: teach arbitrary repo support to iterators
447
+ - refs: plumb repo into ref stores
448
+ - Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules
449
+ - Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
450
+ (this branch uses jk/ref-paranoia and jt/add-submodule-odb-clean-up.)
451
452
Follow through the work to use the repo interface to access
453
submodule objects in-process, instead of abusing the alternate
454
object database interface.
455
301
- Expecting a reroll on top of the jk/ref-paranoia topic.
302
-
456
457
* tp/send-email-completion (2021-09-22) 3 commits
458
- send-email docs: add format-patch options
@@ -309,8 +462,11 @@ Release tarballs are available at:
462
The command line complation for "git send-email" options have been
463
tweaked to make it easier to keep it in sync with the command itself.
464
465
+ Stalled.
466
+ cf. <YU6+BWC+xvGJP3b0@carlos-mbp.lan>
467
+
468
313
-* hm/paint-hits-in-log-grep (2021-09-24) 3 commits
469
+* hm/paint-hits-in-log-grep (2021-09-29) 3 commits
470
- pretty: colorize pattern matches in commit messages
471
- grep: refactor next_match() and match_one_pattern() for external use
472
- Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep
@@ -319,53 +475,35 @@ Release tarballs are available at:
475
"git log --grep=string --author=name" learns to highlight hits just
476
like "git grep string" does.
477
478
+ Will merge to 'next'?
479
+
480
481
* ab/repo-settings-cleanup (2021-09-22) 5 commits
324
- - repository.h: don't use a mix of int and bitfields
325
- - repo-settings.c: simplify the setup
326
- - read-cache & fetch-negotiator: check "enum" values in switch()
327
- - environment.c: remove test-specific "ignore_untracked..." variable
328
- - wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
482
+ (merged to 'next' on 2021-09-28 at 43d70c31e1)
483
+ + repository.h: don't use a mix of int and bitfields
484
+ + repo-settings.c: simplify the setup
485
+ + read-cache & fetch-negotiator: check "enum" values in switch()
486
+ + environment.c: remove test-specific "ignore_untracked..." variable
487
+ + wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
488
489
Code cleanup.
490
332
- Will merge to 'next'.
491
+ Will merge to 'master'.
492
493
494
* ah/connect-parse-feature-v0-fix (2021-09-27) 1 commit
336
- - connect: also update offset for features without values
495
+ (merged to 'next' on 2021-09-29 at 93a45727a2)
496
+ + connect: also update offset for features without values
497
498
Protocol v0 clients can get stuck parsing a malformed feature line.
499
340
- Will merge to 'next'.
341
-
342
-
343
-* ah/unreak-revisions (2021-09-20) 2 commits
344
- - log: UNLEAK original pending objects
345
- - log: UNLEAK rev to silence a large number of leaks
346
-
347
- Mark a few structures with UNLEAK() to help leak detection CI jobs.
348
-
349
- Will merge to 'next'.
350
-
351
-
352
-* ar/submodule-update (2021-09-20) 8 commits
353
- - submodule--helper: rename helper functions
354
- - submodule--helper: remove unused helpers
355
- - submodule--helper: remove update-clone subcommand
356
- - submodule: move core cmd_update() logic to C
357
- - submodule--helper: refactor get_submodule_displaypath()
358
- - submodule--helper: rename helpers for update-clone
359
- - submodule--helper: get remote names from any repository
360
- - submodule--helper: split up ensure_core_worktree()
361
-
362
- Rewrite of "git submodule update" in C.
363
-
364
- Expecting a reroll.
365
- Stomps on a handful of other topics and comes with an overly large step.
500
+ Will merge to 'master'.
501
502
368
-* da/difftool (2021-09-23) 4 commits
503
+* da/difftool (2021-09-30) 7 commits
504
+ - difftool: remove an unnecessary call to strbuf_release()
505
+ - difftool: refactor dir-diff to write files using a helper function
506
+ - difftool: avoid returning -1 to cmd_main() from run_dir_diff()
507
- difftool: add a missing space to the run_dir_diff() comments
508
- difftool: create a tmpdir path without repeated slashes
509
- Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
@@ -374,16 +512,15 @@ Release tarballs are available at:
512
513
Code clean-up in "git difftool".
514
377
- Will merge to 'next'?
378
-
515
516
* da/difftool-dir-diff-symlink-fix (2021-09-23) 1 commit
381
- - difftool: fix symlink-file writing in dir-diff mode
517
+ (merged to 'next' on 2021-09-28 at e2170ed0d7)
518
+ + difftool: fix symlink-file writing in dir-diff mode
519
(this branch is used by da/difftool.)
520
521
"git difftool --dir-diff" mishandled symbolic links.
522
386
- Will merge to 'next'.
523
+ Will merge to 'master'.
524
525
526
* en/removing-untracked-fixes (2021-09-27) 12 commits
@@ -405,39 +542,33 @@ Release tarballs are available at:
542
Will merge to 'next'?
543
544
408
-* en/typofixes (2021-09-20) 2 commits
409
- (merged to 'next' on 2021-09-20 at 48648dafa3)
410
- + merge-ort: fix completely wrong comment
411
- + trace2.h: fix trivial comment typo
412
-
413
- Typofixes.
414
-
415
- Will merge to 'master'.
416
-
417
-
545
* ks/submodule-add-message-fix (2021-09-20) 1 commit
546
- submodule--helper: fix incorrect newlines in an error message
547
548
Message regression fix.
549
423
- Will merge to 'next'.
550
+ Waiting for a response.
551
+ cf. <m27df9lvm1.fsf@gmail.com>
552
553
554
* tb/commit-graph-usage-fix (2021-09-22) 2 commits
427
- - builtin/multi-pack-index.c: disable top-level --[no-]progress
428
- - builtin/commit-graph.c: don't accept common --[no-]progress
555
+ (merged to 'next' on 2021-09-28 at f021339c39)
556
+ + builtin/multi-pack-index.c: disable top-level --[no-]progress
557
+ + builtin/commit-graph.c: don't accept common --[no-]progress
558
430
- Regression fix for "git commit-graph" command line parsing.
559
+ Regression in "git commit-graph" command line parsing has been
560
+ corrected.
561
432
- Will merge to 'next'.
562
+ Will merge to 'master'.
563
564
565
* ws/refer-to-forkpoint-config-in-rebase-doc (2021-09-20) 1 commit
436
- - Document `rebase.forkpoint` in rebase man page
566
+ (merged to 'next' on 2021-09-29 at 49181eaafb)
567
+ + Document `rebase.forkpoint` in rebase man page
568
569
Doc update.
570
440
- Will merge to 'next'?
571
+ Will merge to 'master'.
572
573
574
* jk/clone-unborn-head-in-bare (2021-09-20) 1 commit
@@ -451,27 +582,6 @@ Release tarballs are available at:
582
Will merge to 'master'.
583
584
454
-* jk/reduce-malloc-in-v2-servers (2021-09-15) 12 commits
455
- (merged to 'next' on 2021-09-16 at 40cfe41efc)
456
- + ls-refs: reject unknown arguments
457
- + serve: reject commands used as capabilities
458
- + serve: reject bogus v2 "command=ls-refs=foo"
459
- + docs/protocol-v2: clarify some ls-refs ref-prefix details
460
- + ls-refs: ignore very long ref-prefix counts
461
- + serve: drop "keys" strvec
462
- + serve: provide "receive" function for session-id capability
463
- + serve: provide "receive" function for object-format capability
464
- + serve: add "receive" method for v2 capabilities table
465
- + serve: return capability "value" from get_capability()
466
- + serve: rename is_command() to parse_command()
467
- + Merge branch 'ab/serve-cleanup' into jk/reduce-malloc-in-v2-servers
468
-
469
- Code cleanup to limit memory consumption and tighten protocol
470
- message parsing.
471
-
472
- Will merge to 'master'.
473
-
474
-
585
* ns/batched-fsync (2021-09-27) 8 commits
586
- core.fsyncobjectfiles: performance tests for add and stash
587
- core.fsyncobjectfiles: tests for batch mode
@@ -485,7 +595,8 @@ Release tarballs are available at:
595
The "core.fsyncobjectfiles" configuration variable can now be set
596
to "batch" for improved performance.
597
488
- Will merge to 'next'?
598
+ Under discussion.
599
+ Handling of temporary object directory may be iffy.
600
601
602
* jh/builtin-fsmonitor-part1 (2021-09-20) 7 commits
@@ -513,16 +624,6 @@ Release tarballs are available at:
624
Will merge to 'master'.
625
626
516
-* cb/unicode-14 (2021-09-17) 1 commit
517
- (merged to 'next' on 2021-09-20 at 7873b310ad)
518
- + unicode: update the width tables to Unicode 14
519
-
520
- The unicode character width table (used for output alignment) has
521
- been updated.
522
-
523
- Will merge to 'master'.
524
-
525
-
627
* ab/align-parse-options-help (2021-09-22) 4 commits
628
- parse-options: properly align continued usage output
629
- git rev-parse --parseopt tests: add more usagestr tests
@@ -553,11 +654,12 @@ Release tarballs are available at:
654
Will merge to 'next'?
655
656
556
-* tb/repack-write-midx (2021-09-16) 8 commits
657
+* tb/repack-write-midx (2021-09-28) 9 commits
658
- builtin/repack.c: pass `--refs-snapshot` when writing bitmaps
659
- builtin/repack.c: make largest pack preferred
660
- builtin/repack.c: support writing a MIDX while repacking
661
- builtin/repack.c: extract showing progress to a variable
662
+ - builtin/repack.c: rename variables that deal with non-kept packs
663
- builtin/repack.c: keep track of existing packs unconditionally
664
- midx: preliminary support for `--refs-snapshot`
665
- builtin/multi-pack-index.c: support `--stdin-packs` mode
@@ -566,11 +668,8 @@ Release tarballs are available at:
668
"git repack" has been taught to generate multi-pack reachability
669
bitmaps.
670
569
- Under review.
570
- cf. <YU0TS+KsWY36oeKU@nand.local>
571
-
671
573
-* ds/add-rm-with-sparse-index (2021-09-24) 13 commits
672
+* ds/add-rm-with-sparse-index (2021-09-28) 13 commits
673
- advice: update message to suggest '--sparse'
674
- mv: refuse to move sparse paths
675
- rm: skip sparse paths with missing SKIP_WORKTREE
@@ -589,41 +688,43 @@ Release tarballs are available at:
688
updating paths outside of the sparse-checkout definition unless
689
the user specifies a "--sparse" option.
690
592
- Will merge to 'next'?
691
+ Will merge to 'next'.
692
693
694
* tb/midx-write-propagate-namehash (2021-09-17) 7 commits
596
- - t5326: test propagating hashcache values
597
- - p5326: generate pack bitmaps before writing the MIDX bitmap
598
- - p5326: don't set core.multiPackIndex unnecessarily
599
- - p5326: create missing 'perf-tag' tag
600
- - midx.c: respect 'pack.writeBitmapHashcache' when writing bitmaps
601
- - pack-bitmap.c: propagate namehash values from existing bitmaps
602
- - t/helper/test-bitmap.c: add 'dump-hashes' mode
695
+ (merged to 'next' on 2021-09-29 at 24732fcfc8)
696
+ + t5326: test propagating hashcache values
697
+ + p5326: generate pack bitmaps before writing the MIDX bitmap
698
+ + p5326: don't set core.multiPackIndex unnecessarily
699
+ + p5326: create missing 'perf-tag' tag
700
+ + midx.c: respect 'pack.writeBitmapHashcache' when writing bitmaps
701
+ + pack-bitmap.c: propagate namehash values from existing bitmaps
702
+ + t/helper/test-bitmap.c: add 'dump-hashes' mode
703
704
"git multi-pack-index write --bitmap" learns to propagate the
705
hashcache from original bitmap to resulting bitmap.
706
607
- Will merge to 'next'.
707
+ Will merge to 'master'.
708
709
710
* pw/rebase-of-a-tag-fix (2021-09-22) 10 commits
611
- - rebase: dereference tags
612
- - rebase: use lookup_commit_reference_by_name()
613
- - rebase: use our standard error return value
614
- - t3407: rework rebase --quit tests
615
- - t3407: strengthen rebase --abort tests
616
- - t3407: use test_path_is_missing
617
- - t3407: rename a variable
618
- - t3407: use test_cmp_rev
619
- - t3407: use test_commit
620
- - t3407: run tests in $TEST_DIRECTORY
711
+ (merged to 'next' on 2021-09-28 at 980add2a67)
712
+ + rebase: dereference tags
713
+ + rebase: use lookup_commit_reference_by_name()
714
+ + rebase: use our standard error return value
715
+ + t3407: rework rebase --quit tests
716
+ + t3407: strengthen rebase --abort tests
717
+ + t3407: use test_path_is_missing
718
+ + t3407: rename a variable
719
+ + t3407: use test_cmp_rev
720
+ + t3407: use test_commit
721
+ + t3407: run tests in $TEST_DIRECTORY
722
723
"git rebase <upstream> <tag>" failed when aborted in the middle, as
724
it mistakenly tried to write the tag object instead of peeling it
725
to HEAD.
726
626
- Will merge to 'next'.
727
+ Will merge to 'master'.
728
729
730
* en/zdiff3 (2021-09-20) 2 commits
@@ -646,15 +747,16 @@ Release tarballs are available at:
747
748
749
* jt/add-submodule-odb-clean-up (2021-09-09) 3 commits
649
- - revision: remove "submodule" from opt struct
650
- - repository: support unabsorbed in repo_submodule_init
651
- - submodule: remove unnecessary unabsorbed fallback
750
+ (merged to 'next' on 2021-09-28 at 4d843448be)
751
+ + revision: remove "submodule" from opt struct
752
+ + repository: support unabsorbed in repo_submodule_init
753
+ + submodule: remove unnecessary unabsorbed fallback
754
(this branch is used by jt/no-abuse-alternate-odb-for-submodules.)
755
654
- More code paths that uses the hack to add submodule's object
756
+ More code paths that use the hack to add submodule's object
757
database to the set of alternate object store have been cleaned up.
758
657
- Will merge to 'next'.
759
+ Will merge to 'master'.
760
761
762
* jx/ci-l10n (2021-09-09) 1 commit
@@ -685,7 +787,8 @@ Release tarballs are available at:
787
788
Add pieces from "scalar" to contrib/.
789
688
- Will merge to 'next'?
790
+ Waiting for a response.
791
+ cf. <pull.1005.v4.git.1631630356.gitgitgadget@gmail.com>
792
793
794
* ab/sanitize-leak-ci (2021-09-23) 2 commits
@@ -694,7 +797,7 @@ Release tarballs are available at:
797
798
CI learns to run the leak sanitizer builds.
799
697
- Will merge to 'next'?
800
+ Will merge to 'next'.
801
802
803
* ms/customizable-ident-expansion (2021-09-01) 1 commit
@@ -740,17 +843,18 @@ Release tarballs are available at:
843
844
845
* sg/test-split-index-fix (2021-09-07) 7 commits
743
- - read-cache: fix GIT_TEST_SPLIT_INDEX
744
- - tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests
745
- - read-cache: look for shared index files next to the index, too
746
- - t1600-index: disable GIT_TEST_SPLIT_INDEX
747
- - t1600-index: don't run git commands upstream of a pipe
748
- - t1600-index: remove unnecessary redirection
749
- - Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix
846
+ (merged to 'next' on 2021-09-29 at 661ae75778)
847
+ + read-cache: fix GIT_TEST_SPLIT_INDEX
848
+ + tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests
849
+ + read-cache: look for shared index files next to the index, too
850
+ + t1600-index: disable GIT_TEST_SPLIT_INDEX
851
+ + t1600-index: don't run git commands upstream of a pipe
852
+ + t1600-index: remove unnecessary redirection
853
+ + Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix
854
855
Test updates.
856
753
- Will merge to 'next'?
857
+ Will merge to 'master'.
858
859
860
* ab/refs-errno-cleanup (2021-08-25) 4 commits
@@ -762,6 +866,8 @@ Release tarballs are available at:
866
867
The "remainder" of hn/refs-errno-cleanup topic.
868
869
+ What's the status of this one? Meh?
870
+
871
872
* ab/lib-subtest (2021-09-22) 9 commits
873
- test-lib tests: get rid of copy/pasted mock test code
@@ -805,9 +911,7 @@ Release tarballs are available at:
911
912
Use ssh public crypto for object and push-cert signing.
913
808
- On hold.
809
- cf. <pull.1041.v8.git.git.1631304462.gitgitgadget@gmail.com>
810
- cf. <532d97e7-8c91-df6a-6d90-70668256f513@gigacodes.de>
914
+ Will merge to 'next'?
915
916
917
* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
@@ -844,8 +948,7 @@ Release tarballs are available at:
948
cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
949
950
847
-* hn/reftable (2021-09-10) 20 commits
848
- - fixup! reftable: implement stack, a mutable database of reftable files.
951
+* hn/reftable (2021-09-28) 19 commits
952
- Add "test-tool dump-reftable" command.
953
- reftable: add dump utility
954
- reftable: implement stack, a mutable database of reftable files.
@@ -869,7 +972,7 @@ Release tarballs are available at:
972
The "reftable" backend for the refs API, without integrating into
973
the refs subsystem.
974
872
- Will merge to 'next'?
975
+ Will merge to 'next'.
976
977
978
* ab/refs-files-cleanup (2021-08-25) 13 commits
@@ -1045,3 +1148,24 @@ Release tarballs are available at:
1148
Replaced by the ab/make-compdb-fix topic that uses the same
1149
approach as the ab/auto-depend-with-pedantic topic.
1150
1151
+
1152
+* ab/pack-objects-stdin (2021-07-09) 5 commits
1153
+ . pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
1154
+ . pack-objects.c: do stdin parsing via revision.c's API
1155
+ . revision.[ch]: add a "handle_stdin_line" API
1156
+ . revision.h: refactor "disable_stdin" and "read_from_stdin"
1157
+ . upload-pack: run is_repository_shallow() before setup_revisions()
1158
+
1159
+ Introduce handle_stdin_line callback to revision API and uses it.
1160
+
1161
+ Retracted for now.
1162
+
1163
+
1164
+* ah/unleak-revisions (2021-09-20) 2 commits
1165
+ . log: UNLEAK original pending objects
1166
+ . log: UNLEAK rev to silence a large number of leaks
1167
+
1168
+ Mark a few structures with UNLEAK() to help leak detection CI jobs.
1169
+
1170
+ Retracted.
1171
+ cf. <05754f9c-cd58-30f5-e2d3-58b9221d2770@ahunt.org>