What's cooking (2021/06 #06)
Junio C Hamano committed
Jun 17, 2021 at 11:52 UTC
2cbe4a3e125e059242544ae415ee82452eccc15b
1 file changed
+402
-404
whats-cooking.txt
+402
-404
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2021, #05; Tue, 15)
3
+Subject: What's cooking in git.git (Jun 2021, #06; Thu, 17)
4
X-master-at: 670b81a890388c60b7032a4f5b879f2ece8c4558
5
-X-next-at: b9a5e34162c5102e3c3898ea7d8bc369f6bb4390
5
+X-next-at: 670b81a890388c60b7032a4f5b879f2ece8c4558
6
7
-What's cooking in git.git (Jun 2021, #05; Tue, 15)
7
+What's cooking in git.git (Jun 2021, #06; Thu, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -19,14 +19,12 @@ another topic already in flight" or "this may turn out to be
19
useful")---do not read too much into a topic being in (or not in)
20
'seen'.
21
22
-With two batches of topics graduated from it, 'next' is now empty,
23
-and I plan to rewind and rebuild it for this cycle soonish. Please
24
-stop me if you know any of the topics expected to be merged to
25
-'next' in this issue of the report is premature. Also accumulated
26
-on 'seen' are too many topics that are expecting an update but have
27
-been stalled for too long. I expect I'll discard those that haven't
28
-seen activity for more than a month, unless there are some updates
29
-by the end of this month.
22
+The tip of 'next' has been rewound. We'll start merging topics that
23
+have been reviewed well down. On the other hand, some topics have
24
+been waiting for updates for too long. I've started marking them
25
+for discarding. Motivated contributors may want to take a look of
26
+them, pick an easy one or two, reroll them on behalf of the original
27
+authors, to resurrect them.
28
29
Copies of the source code to Git live in many repositories, and the
30
following is a list of the ones I push into or their mirrors. Some
@@ -57,149 +55,236 @@ Release tarballs are available at:
55
https://www.kernel.org/pub/software/scm/git/
56
57
--------------------------------------------------
60
-[Graduated to 'master']
58
+[New Topics]
59
+
60
+* ab/config-based-hooks-base (2021-06-16) 30 commits
61
+ - hook-list.h: add a generated list of hooks, like config-list.h
62
+ - hooks: fix a TOCTOU in "did we run a hook?" heuristic
63
+ - receive-pack: convert receive hooks to hook.h
64
+ - post-update: use hook.h library
65
+ - receive-pack: convert 'update' hook to hook.h
66
+ - hooks: allow callers to capture output
67
+ - run-command: allow capturing of collated output
68
+ - reference-transaction: use hook.h to run hooks
69
+ - transport: convert pre-push hook to use config
70
+ - hook: convert 'post-rewrite' hook in sequencer.c to hook.h
71
+ - hook: provide stdin by string_list or callback
72
+ - run-command: add stdin callback for parallelization
73
+ - am: convert 'post-rewrite' hook to hook.h
74
+ - hook: support passing stdin to hooks
75
+ - run-command: allow stdin for run_processes_parallel
76
+ - run-command: remove old run_hook_{le,ve}() hook API
77
+ - receive-pack: convert push-to-checkout hook to hook.h
78
+ - read-cache: convert post-index-change hook to use config
79
+ - commit: use hook.h to execute hooks
80
+ - git-p4: use 'git hook' to run hooks
81
+ - send-email: use 'git hook run' for 'sendemail-validate'
82
+ - git hook run: add an --ignore-missing flag
83
+ - merge: use config-based hooks for post-merge hook
84
+ - hooks: convert 'post-checkout' hook to hook library
85
+ - am: convert applypatch hooks to use config
86
+ - rebase: teach pre-rebase to use hook.h
87
+ - gc: use hook library for pre-auto-gc hook
88
+ - hook.c: add a hook_exists() wrapper and use it in bugreport.c
89
+ - run-command.h: move find_hook() to hook.h
90
+ - hook: add 'run' subcommand
91
+
92
+ Restructuring of (a subset of) Emily's config-based-hooks series,
93
+ to demonstrate that a series can be presented as a more logical and
94
+ focused progression.
95
+
96
+ Waiting for reviews.
97
+
98
+
99
+* ab/config-hooks-path-testfix (2021-06-16) 1 commit
100
+ - pre-commit hook tests: don't leave "actual" nonexisting on failure
101
+
102
+ Test fix.
103
+
104
+ Will merge to 'next'.
105
+
106
+
107
+* ab/doc-retire-alice-bob (2021-06-16) 6 commits
108
+ - pack-protocol doc: use "www-data" in place of "alice"
109
+ - doc: replace "alice" and "bob" with "jdoe" and "msmith"
110
+ - fast-import doc: change "bob" in an example to "file.txt"
111
+ - daemon doc + code comments: reword "alice" example
112
+ - gitcvs-migration doc: replace "alice" and "bob" with "you" and "www-data"
113
+ - gittutorial doc: replace "alice" and "bob" with "you" and "www-data"
114
+
115
62
-* ab/test-lib-updates (2021-05-11) 11 commits
63
- (merged to 'next' on 2021-05-31 at 73bf1ecb31)
64
- + test-lib: split up and deprecate test_create_repo()
65
- + test-lib: do not show advice about init.defaultBranch under --verbose
66
- + test-lib: reformat argument list in test_create_repo()
67
- + submodule tests: use symbolic-ref --short to discover branch name
68
- + test-lib functions: add --printf option to test_commit
69
- + describe tests: convert setup to use test_commit
70
- + test-lib functions: add an --annotated option to "test_commit"
71
- + test-lib-functions: document test_commit --no-tag
72
- + test-lib-functions: reword "test_commit --append" docs
73
- + test-lib tests: remove dead GIT_TEST_FRAMEWORK_SELFTEST variable
74
- + test-lib: bring $remove_trash out of retirement
75
- (this branch is used by ab/describe-tests-fix and ab/pickaxe-pcre2.)
116
+* ab/pre-auto-gc-hook-test (2021-06-16) 1 commit
117
+ - gc tests: add a test for the "pre-auto-gc" hook
118
77
- Test clean-up.
119
+ Test fix.
120
+
121
+ Will merge to 'next'.
122
123
80
-* ab/trace2-squelch-gcc-warning (2021-05-21) 1 commit
81
- (merged to 'next' on 2021-05-28 at 6c7a015f99)
82
- + trace2: refactor to avoid gcc warning under -O3
124
+* jv/userdiff-csharp-update (2021-06-16) 1 commit
125
+ - userdiff: add support for C# record types
126
84
- Workaround compiler warnings.
127
+ The userdiff pattern for C# learned the token "record".
128
129
+ Will merge to 'next'.
130
87
-* dd/honor-users-tar-in-tests (2021-05-22) 1 commit
88
- (merged to 'next' on 2021-05-28 at 56961581ce)
89
- + t: use configured TAR instead of tar
131
91
- Test portability fix.
132
+* en/ort-perf-batch-13 (2021-06-16) 5 commits
133
+ - merge-ort: add prefetching for content merges
134
+ - diffcore-rename: use a different prefetch for basename comparisons
135
+ - diffcore-rename: allow different missing_object_cb functions
136
+ - t6421: add tests checking for excessive object downloads during merge
137
+ - promisor-remote: output trace2 statistics for number of objects fetched
138
139
+ Performance tweaks of "git merge -sort" around lazy fetching of objects.
140
94
-* ds/write-index-with-hashfile-api (2021-05-19) 4 commits
95
- (merged to 'next' on 2021-05-28 at f0c51ddf7c)
96
- + read-cache: delete unused hashing methods
97
- + read-cache: use hashfile instead of git_hash_ctx
98
- + csum-file.h: increase hashfile buffer size
99
- + hashfile: use write_in_full()
141
101
- Use the hashfile API in the codepath that writes the index file to
102
- reduce code duplication.
142
+* ab/serve-cleanup (2021-06-17) 5 commits
143
+ - serve: use designated initializers
144
+ - transport: use designated initializers
145
+ - transport: rename "fetch" in transport_vtable to "fetch_refs"
146
+ - SQUASH??? struct strvec no longer needed
147
+ - serve: mark has_capability() as static
148
149
+ Code clean-up around "git serve".
150
105
-* en/ort-perf-batch-11 (2021-05-20) 13 commits
106
- (merged to 'next' on 2021-05-28 at 58a8b85d6a)
107
- + merge-ort, diffcore-rename: employ cached renames when possible
108
- + merge-ort: handle interactions of caching and rename/rename(1to1) cases
109
- + merge-ort: add helper functions for using cached renames
110
- + merge-ort: preserve cached renames for the appropriate side
111
- + merge-ort: avoid accidental API mis-use
112
- + merge-ort: add code to check for whether cached renames can be reused
113
- + merge-ort: populate caches of rename detection results
114
- + merge-ort: add data structures for in-memory caching of rename detection
115
- + t6429: testcases for remembering renames
116
- + fast-rebase: write conflict state to working tree, index, and HEAD
117
- + fast-rebase: change assert() to BUG()
118
- + Documentation/technical: describe remembering renames optimization
119
- + t6423: rename file within directory that other side renamed
120
- (this branch is used by en/ort-perf-batch-12.)
151
122
- Optimize out repeated rename detection in a sequence of mergy
123
- operations.
152
+* js/stop-exporting-bogus-columns (2021-06-17) 1 commit
153
+ - pager: do not unnecessarily set COLUMNS on Windows
154
+
155
+ When we cannot figure out how wide the terminal is, we use a
156
+ fallback value of 80 ourselves (which cannot be avoided), but when
157
+ we run the pager, we export it in COLUMNS, which forces the pager
158
+ to use the hardcoded value, even when the pager is perfectly
159
+ capable to figure it out itself. Stop exporting COLUMNS
160
+ only when building on Windows to work around this issue.
161
+
162
+--------------------------------------------------
163
+[Stalled]
164
+
165
+* hn/reftable (2021-05-20) 28 commits
166
+ . t1404: annotate test cases with REFFILES
167
+ . t1401,t2011: parameterize HEAD.lock for REFTABLE
168
+ . t1301: document what needs to be done for REFTABLE
169
+ . Add "test-tool dump-reftable" command.
170
+ . git-prompt: prepare for reftable refs backend
171
+ . Reftable support for git-core
172
+ . reftable: add dump utility
173
+ . reftable: implement stack, a mutable database of reftable files.
174
+ . reftable: implement refname validation
175
+ . reftable: add merged table view
176
+ . reftable: add a heap-based priority queue for reftable records
177
+ . reftable: reftable file level tests
178
+ . reftable: read reftable files
179
+ . reftable: generic interface to tables
180
+ . reftable: write reftable files
181
+ . reftable: a generic binary tree implementation
182
+ . reftable: reading/writing blocks
183
+ . Provide zlib's uncompress2 from compat/zlib-compat.c
184
+ . reftable: (de)serialization for the polymorphic record type.
185
+ . reftable: add blocksource, an abstraction for random access reads
186
+ . reftable: utility functions
187
+ . reftable: add error related functionality
188
+ . reftable: add LICENSE
189
+ . init-db: set the_repository->hash_algo early on
190
+ . hash.h: provide constants for the hash IDs
191
+ . refs/debug: trace into reflog expiry too
192
+ . refs: document reflog_expire_fn's flag argument
193
+ . refs: make explicit that ref_iterator_peel returns boolean
194
+
195
+ The "reftable" backend for the refs API.
196
197
+ Waiting for reviews.
198
+ Seems to break tests when merged to 'seen'.
199
126
-* fc/doc-build-cleanup (2021-05-24) 5 commits
127
- (merged to 'next' on 2021-05-31 at af103e12f4)
128
- + doc: avoid using rm directly
129
- + doc: simplify Makefile using .DELETE_ON_ERROR
130
- + doc: remove unnecessary rm instances
131
- + doc: improve asciidoc dependencies
132
- + doc: refactor common asciidoc dependencies
200
134
- Preparatory build procedure clean-up for documentation.
201
+* ao/p4-avoid-decoding (2021-04-12) 2 commits
202
+ - git-p4: do not decode data from perforce by default
203
+ - git-p4: avoid decoding more data from perforce
204
205
+ "git p4" in Python-2 days used to accept a lot more kinds of data
206
+ from Perforce server as uninterrupted byte sequence, but after
207
+ switching to Python-3, too many things are expected to be in UTF-8,
208
+ which broke traditional use cases.
209
137
-* ga/send-email-sendmail-cmd (2021-05-17) 1 commit
138
- (merged to 'next' on 2021-05-22 at 755df67f0e)
139
- + git-send-email: add option to specify sendmail command
210
+ Waiting for reviews.
211
141
- "git send-email" learned the "--sendmail-cmd" command line option
142
- and the "sendemail.sendmailCmd" configuration variable, which is a
143
- more sensible approach than the current way of repurposing the
144
- "smtp-server" that is meant to name the server to instead name the
145
- command to talk to the server.
212
213
+* tv/p4-fallback-encoding (2021-04-30) 1 commit
214
+ - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
215
148
-* jk/clone-clean-upon-transport-error (2021-05-19) 1 commit
149
- (merged to 'next' on 2021-05-22 at 464b1f187c)
150
- + clone: clean up directory after transport_fetch_refs() failure
216
+ "git p4" learns the fallbackEncoding configuration variable to
217
+ safely accept changeset descriptions that aren't written in UTF-8.
218
152
- Recent "git clone" left a temporary directory behind when the
153
- transport layer returned an failure.
219
+ Waiting for reviews.
220
221
156
-* jk/fetch-pack-v2-half-close-early (2021-05-20) 1 commit
157
- (merged to 'next' on 2021-05-28 at 56e97ec2df)
158
- + fetch-pack: signal v2 server that we are done making requests
222
+* ds/status-with-sparse-index (2021-05-22) 14 commits
223
+ - fsmonitor: integrate with sparse index
224
+ - wt-status: expand added sparse directory entries
225
+ - status: use sparse-index throughout
226
+ - status: skip sparse-checkout percentage with sparse-index
227
+ - dir.c: accept a directory as part of cone-mode patterns
228
+ - unpack-trees: be careful around sparse directory entries
229
+ - unpack-trees: compare sparse directories correctly
230
+ - unpack-trees: preserve cache_bottom
231
+ - t1092: add tests for status/add and sparse files
232
+ - t1092: expand repository data shape
233
+ - sparse-index: include EXTENDED flag when expanding
234
+ - sparse-index: skip indexes with unmerged entries
235
+ - Merge branch 'mt/add-rm-in-sparse-checkout' into ds/status-with-sparse-index
236
+ - Merge branch 'ds/sparse-index-protections' into ds/status-with-sparse-index
237
160
- "git fetch" over protocol v2 left its side of the socket open after
161
- it finished speaking, which unnecessarily wasted the resource on
162
- the other side.
238
+ "git status" codepath learned to work with sparsely populated index
239
+ without hydrating it fully.
240
241
+ Expecting a reroll.
242
+ cf. <2784d29b-b22a-2bf6-2450-7b4a0a72df54@gmail.com>
243
165
-* ps/rev-list-object-type-filter (2021-05-21) 1 commit
166
- (merged to 'next' on 2021-05-28 at f22e938f3e)
167
- + help: fix small typo in error message
244
169
- Message update.
245
+* ab/describe-tests-fix (2021-05-11) 5 commits
246
+ - describe tests: support -C in "check_describe"
247
+ - describe tests: fix nested "test_expect_success" call
248
+ - describe tests: don't rely on err.actual from "check_describe"
249
+ - describe tests: refactor away from glob matching
250
+ - describe tests: improve test for --work-tree & --dirty
251
252
+ Various updates to tests around "git describe"
253
172
-* so/log-m-implies-p (2021-05-21) 10 commits
173
- (merged to 'next' on 2021-05-28 at 2733ec2409)
174
- + diff-merges: let "-m" imply "-p"
175
- + diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
176
- + stash list: stop passing "-m" to "git log"
177
- + git-svn: stop passing "-m" to "git rev-list"
178
- + diff-merges: move specific diff-index "-m" handling to diff-index
179
- + t4013: test "git diff-index -m"
180
- + t4013: test "git diff-tree -m"
181
- + t4013: test "git log -m --stat"
182
- + t4013: test "git log -m --raw"
183
- + t4013: test that "-m" alone has no effect in "git log"
254
+ Will merge to 'next'.
255
185
- The "-m" option in "git log -m" that does not specify which format,
186
- if any, of diff is desired did not have any visible effect; it now
187
- implies some form of diff (by default "--patch") is produced.
256
257
+* ab/pickaxe-pcre2 (2021-05-11) 22 commits
258
+ - xdiff-interface: replace discard_hunk_line() with a flag
259
+ - xdiff users: use designated initializers for out_line
260
+ - pickaxe -G: don't special-case create/delete
261
+ - pickaxe -G: terminate early on matching lines
262
+ - xdiff-interface: allow early return from xdiff_emit_line_fn
263
+ - xdiff-interface: prepare for allowing early return
264
+ - pickaxe -S: slightly optimize contains()
265
+ - pickaxe: rename variables in has_changes() for brevity
266
+ - pickaxe -S: support content with NULs under --pickaxe-regex
267
+ - pickaxe: assert that we must have a needle under -G or -S
268
+ - pickaxe: refactor function selection in diffcore-pickaxe()
269
+ - perf: add performance test for pickaxe
270
+ - pickaxe/style: consolidate declarations and assignments
271
+ - diff.h: move pickaxe fields together again
272
+ - pickaxe: die when --find-object and --pickaxe-all are combined
273
+ - pickaxe: die when -G and --pickaxe-regex are combined
274
+ - pickaxe tests: add missing test for --no-pickaxe-regex being an error
275
+ - pickaxe tests: test for -G, -S and --find-object incompatibility
276
+ - pickaxe tests: add test for "log -S" not being a regex
277
+ - pickaxe tests: add test for diffgrep_consume() internals
278
+ - pickaxe tests: refactor to use test_commit --append --printf
279
+ - grep/pcre2 tests: reword comments referring to kwset
280
190
-* zh/ref-filter-atom-type (2021-05-14) 2 commits
191
- (merged to 'next' on 2021-05-16 at 48fd717185)
192
- + ref-filter: introduce enum atom_type
193
- + ref-filter: add objectsize to used_atom
194
- (this branch is used by zh/ref-filter-raw-data.)
281
+ Rewrite the backend for "diff -G/-S" to use pcre2 engine when
282
+ available.
283
196
- The code to handle the "--format" option in "for-each-ref" and
197
- friends made too many string comparisons on %(atom)s used in the
198
- format string, which has been corrected by converting them into
199
- enum when the format string is parsed.
284
+ Will merge to 'next'.
285
286
--------------------------------------------------
202
-[New Topics]
287
+[Cooking]
288
289
* ah/uninitialized-reads-fix (2021-06-15) 3 commits
290
- builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
@@ -278,6 +363,9 @@ Release tarballs are available at:
363
364
Fill test gaps.
365
366
+ Expecting a reroll.
367
+ cf. <87czsnyyt8.fsf@evledraar.gmail.com>
368
+
369
370
* ab/show-branch-tests (2021-06-15) 4 commits
371
- show-branch tests: add missing tests
@@ -287,6 +375,9 @@ Release tarballs are available at:
375
376
Fill test gaps.
377
378
+ Waiting for review discussion to settle.
379
+ cf. <162374905722.40525.516266574605586007.git@grubix.eu>
380
+
381
382
* ah/graph-typofix (2021-06-15) 1 commit
383
- graph: improve grammar of "invalid color" error message
@@ -296,7 +387,8 @@ Release tarballs are available at:
387
Will merge to 'next'.
388
389
299
-* es/superproject-aware-submodules (2021-06-14) 4 commits
390
+* es/superproject-aware-submodules (2021-06-16) 5 commits
391
+ - SQUASH???
392
- submodule: cache superproject gitdir during 'update'
393
- submodule: cache superproject gitdir during absorbgitdirs
394
- introduce submodule.superprojectGitDir cache
@@ -308,18 +400,6 @@ Release tarballs are available at:
400
Waiting for reviews.
401
402
311
-* fc/neuter-doc (2021-06-14) 2 commits
312
- - comments: avoid using the gender of our users
313
- - doc: avoid using the gender of other people
314
-
315
- An attempt to avoid gendered pronouns by rewriting parts of docs.
316
-
317
- This seems to give more readable result than Stolee's "use singular
318
- they" topic.
319
-
320
- Will wait for conclusion of the on-list discussion.
321
-
322
-
403
* fc/pull-cleanups (2021-06-15) 3 commits
404
- pull: trivial whitespace style fix
405
- pull: trivial cleanup
@@ -351,7 +431,8 @@ Release tarballs are available at:
431
432
"Zealous diff3" style of merge conflict presentation has been added.
433
354
- Waiting for reviews.
434
+ Expecting a reroll.
435
+ cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>
436
437
438
* pw/diff-color-moved-fix (2021-06-15) 10 commits
@@ -371,228 +452,6 @@ Release tarballs are available at:
452
453
Waiting for reviews.
454
374
---------------------------------------------------
375
-[Stalled]
376
-
377
-* mr/bisect-in-c-4 (2021-04-11) 4 commits
378
- - bisect--helper: retire `--bisect-next-check` subcommand
379
- - bisect--helper: reimplement `bisect_run` shell function in C
380
- - bisect--helper: reimplement `bisect_visualize()`shell function in C
381
- - run-command: make `exists_in_PATH()` non-static
382
-
383
- The codepaths involved in running "git bisect visualize" and "git
384
- bisect run" has been rewritten in C.
385
-
386
- Expecting a reroll.
387
- cf. <xmqq35vwh8qk.fsf@gitster.g>, <xmqqy2doftrj.fsf@gitster.g>,
388
- <CAP8UFD3X24F3qgefHpi00PM-KUk+vcqxwy2Dbngbyj7ciavCVQ@mail.gmail.com>
389
- May want to boost the test coverage.
390
-
391
-
392
-* hn/reftable (2021-05-20) 28 commits
393
- . t1404: annotate test cases with REFFILES
394
- . t1401,t2011: parameterize HEAD.lock for REFTABLE
395
- . t1301: document what needs to be done for REFTABLE
396
- . Add "test-tool dump-reftable" command.
397
- . git-prompt: prepare for reftable refs backend
398
- . Reftable support for git-core
399
- . reftable: add dump utility
400
- . reftable: implement stack, a mutable database of reftable files.
401
- . reftable: implement refname validation
402
- . reftable: add merged table view
403
- . reftable: add a heap-based priority queue for reftable records
404
- . reftable: reftable file level tests
405
- . reftable: read reftable files
406
- . reftable: generic interface to tables
407
- . reftable: write reftable files
408
- . reftable: a generic binary tree implementation
409
- . reftable: reading/writing blocks
410
- . Provide zlib's uncompress2 from compat/zlib-compat.c
411
- . reftable: (de)serialization for the polymorphic record type.
412
- . reftable: add blocksource, an abstraction for random access reads
413
- . reftable: utility functions
414
- . reftable: add error related functionality
415
- . reftable: add LICENSE
416
- . init-db: set the_repository->hash_algo early on
417
- . hash.h: provide constants for the hash IDs
418
- . refs/debug: trace into reflog expiry too
419
- . refs: document reflog_expire_fn's flag argument
420
- . refs: make explicit that ref_iterator_peel returns boolean
421
-
422
- The "reftable" backend for the refs API.
423
-
424
- Waiting for reviews.
425
- Seems to break tests when merged to 'seen'.
426
-
427
-
428
-* ma/t0091-bugreport-fix (2021-04-12) 1 commit
429
- - t0091-bugreport.sh: actually verify some content of report
430
-
431
- Test fix.
432
-
433
- Expecting a reroll.
434
- cf. <YHYZTLl90rkWWVOr@google.com>, <87a6q22dei.fsf@evledraar.gmail.com>
435
-
436
-
437
-* ls/fast-export-signed (2021-05-03) 5 commits
438
- - fast-export, fast-import: add support for signed-commits
439
- - fast-export: do not modify memory from get_commit_buffer
440
- - git-fast-export.txt: clarify why 'verbatim' may not be a good idea
441
- - fast-export: rename --signed-tags='warn' to 'warn-verbatim'
442
- - git-fast-import.txt: add missing LF in the BNF
443
-
444
- "git fast-export" offers a way to control how signed tags are
445
- handled; the mechanism has been extended to allow specifying how
446
- signed commits are handled as well.
447
-
448
- Expecting a reroll.
449
- cf. <xmqqa6pca0pv.fsf@gitster.g>, <xmqq1rao9zev.fsf@gitster.g>
450
-
451
-
452
-* tb/multi-pack-bitmaps (2021-04-10) 23 commits
453
- . p5326: perf tests for MIDX bitmaps
454
- . p5310: extract full and partial bitmap tests
455
- . midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
456
- . t7700: update to work with MIDX bitmap test knob
457
- . t5319: don't write MIDX bitmaps in t5319
458
- . t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
459
- . t5326: test multi-pack bitmap behavior
460
- . t/helper/test-read-midx.c: add --checksum mode
461
- . t5310: move some tests to lib-bitmap.sh
462
- . pack-bitmap: write multi-pack bitmaps
463
- . pack-bitmap: read multi-pack bitmaps
464
- . pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
465
- . pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
466
- . pack-bitmap.c: introduce 'bitmap_num_objects()'
467
- . midx: respect 'core.multiPackIndex' when writing
468
- . midx: clear auxiliary .rev after replacing the MIDX
469
- . midx: make a number of functions non-static
470
- . Documentation: describe MIDX-based bitmaps
471
- . Documentation: build 'technical/bitmap-format' by default
472
- . pack-bitmap-write.c: free existing bitmaps
473
- . pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
474
- . pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps
475
- . Merge branch 'tb/pack-preferred-tips-to-give-bitmap' into tb/multi-pack-bitmaps
476
-
477
- The reachability bitmap file used to be generated only for a single
478
- pack, but now we've learned to generate bitmaps for history that
479
- span across multiple packfiles.
480
-
481
- Waiting for reviews.
482
- cf. <cover.1617991824.git.me@ttaylorr.com>
483
- Seems to break tests when merged to 'seen'.
484
-
485
-
486
-* ao/p4-avoid-decoding (2021-04-12) 2 commits
487
- - git-p4: do not decode data from perforce by default
488
- - git-p4: avoid decoding more data from perforce
489
-
490
- "git p4" in Python-2 days used to accept a lot more kinds of data
491
- from Perforce server as uninterrupted byte sequence, but after
492
- switching to Python-3, too many things are expected to be in UTF-8,
493
- which broke traditional use cases.
494
-
495
- Waiting for reviews.
496
-
497
-
498
-* ag/merge-strategies-in-c (2021-03-17) 15 commits
499
- - sequencer: use the "octopus" merge strategy without forking
500
- - sequencer: use the "resolve" strategy without forking
501
- - merge: use the "octopus" strategy without forking
502
- - merge: use the "resolve" strategy without forking
503
- - merge-octopus: rewrite in C
504
- - merge-recursive: move better_branch_name() to merge.c
505
- - merge-resolve: rewrite in C
506
- - merge-one-file: rewrite in C
507
- - update-index: move add_cacheinfo() to read-cache.c
508
- - merge-index: add a new way to invoke `git-merge-one-file'
509
- - merge-index: drop the index
510
- - merge-index: libify merge_one_path() and merge_all()
511
- - t6060: add tests for removed files
512
- - t6060: modify multiple files to expose a possible issue with merge-index
513
- - t6407: modernise tests
514
-
515
- The resolve and octopus merge strategy backends have been rewritten
516
- in C.
517
-
518
- Expecting a (hopefully final) reroll.
519
- cf. <nycvar.QRO.7.76.6.2103241142220.50@tvgsbejvaqbjf.bet>
520
-
521
-
522
-* tv/p4-fallback-encoding (2021-04-30) 1 commit
523
- - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
524
-
525
- "git p4" learns the fallbackEncoding configuration variable to
526
- safely accept changeset descriptions that aren't written in UTF-8.
527
-
528
- Waiting for reviews.
529
-
530
-
531
-* ds/status-with-sparse-index (2021-05-22) 14 commits
532
- - fsmonitor: integrate with sparse index
533
- - wt-status: expand added sparse directory entries
534
- - status: use sparse-index throughout
535
- - status: skip sparse-checkout percentage with sparse-index
536
- - dir.c: accept a directory as part of cone-mode patterns
537
- - unpack-trees: be careful around sparse directory entries
538
- - unpack-trees: compare sparse directories correctly
539
- - unpack-trees: preserve cache_bottom
540
- - t1092: add tests for status/add and sparse files
541
- - t1092: expand repository data shape
542
- - sparse-index: include EXTENDED flag when expanding
543
- - sparse-index: skip indexes with unmerged entries
544
- - Merge branch 'mt/add-rm-in-sparse-checkout' into ds/status-with-sparse-index
545
- - Merge branch 'ds/sparse-index-protections' into ds/status-with-sparse-index
546
-
547
- "git status" codepath learned to work with sparsely populated index
548
- without hydrating it fully.
549
-
550
- Waiting for reviews.
551
-
552
-
553
-* ab/describe-tests-fix (2021-05-11) 5 commits
554
- - describe tests: support -C in "check_describe"
555
- - describe tests: fix nested "test_expect_success" call
556
- - describe tests: don't rely on err.actual from "check_describe"
557
- - describe tests: refactor away from glob matching
558
- - describe tests: improve test for --work-tree & --dirty
559
-
560
- Various updates to tests around "git describe"
561
-
562
- Will merge to 'next'.
563
-
564
-
565
-* ab/pickaxe-pcre2 (2021-05-11) 22 commits
566
- - xdiff-interface: replace discard_hunk_line() with a flag
567
- - xdiff users: use designated initializers for out_line
568
- - pickaxe -G: don't special-case create/delete
569
- - pickaxe -G: terminate early on matching lines
570
- - xdiff-interface: allow early return from xdiff_emit_line_fn
571
- - xdiff-interface: prepare for allowing early return
572
- - pickaxe -S: slightly optimize contains()
573
- - pickaxe: rename variables in has_changes() for brevity
574
- - pickaxe -S: support content with NULs under --pickaxe-regex
575
- - pickaxe: assert that we must have a needle under -G or -S
576
- - pickaxe: refactor function selection in diffcore-pickaxe()
577
- - perf: add performance test for pickaxe
578
- - pickaxe/style: consolidate declarations and assignments
579
- - diff.h: move pickaxe fields together again
580
- - pickaxe: die when --find-object and --pickaxe-all are combined
581
- - pickaxe: die when -G and --pickaxe-regex are combined
582
- - pickaxe tests: add missing test for --no-pickaxe-regex being an error
583
- - pickaxe tests: test for -G, -S and --find-object incompatibility
584
- - pickaxe tests: add test for "log -S" not being a regex
585
- - pickaxe tests: add test for diffgrep_consume() internals
586
- - pickaxe tests: refactor to use test_commit --append --printf
587
- - grep/pcre2 tests: reword comments referring to kwset
588
-
589
- Rewrite the backend for "diff -G/-S" to use pcre2 engine when
590
- available.
591
-
592
- Will merge to 'next'.
593
-
594
---------------------------------------------------
595
-[Cooking]
455
456
* hn/refs-errno-cleanup (2021-06-11) 8 commits
457
- refs: explicitly propagate errno from refs_read_raw_ref
@@ -713,7 +572,7 @@ Release tarballs are available at:
572
Will merge to 'next'.
573
574
716
-* ar/submodule-add (2021-06-15) 3 commits
575
+* ar/submodule-add (2021-06-16) 3 commits
576
- submodule--helper: introduce add-config subcommand
577
- submodule--helper: introduce add-clone subcommand
578
- submodule--helper: refactor module_clone()
@@ -723,16 +582,19 @@ Release tarballs are available at:
582
Waiting for reviews.
583
584
726
-* ds/gender-neutral-doc (2021-06-10) 4 commits
727
- . CodingGuidelines: recommend singular they
728
- . *: fix typos
729
- . *: use singular they in comments
730
- . Documentation: use singular they when appropriate
585
+* ds/gender-neutral-doc (2021-06-16) 5 commits
586
+ - SQUASH??? replace neutering tips with that of Æver
587
+ - CodingGuidelines: recommend singular they
588
+ - *: fix typos
589
+ - comments: avoid using the gender of our users
590
+ - doc: avoid using the gender of other people
591
592
Attempt to update the documentation not to assume users are of
593
certain gender and adds to guidelines to do so.
594
595
Will wait for conclusion of the on-list discussion.
596
+ It appears that the updates to the text are favourably accepted by
597
+ reviewers, but not necessarily the update to the guidelines.
598
599
600
* gh/gitweb-branch-sort (2021-06-10) 1 commit
@@ -914,58 +776,28 @@ Release tarballs are available at:
776
- diffcore-rename: avoid unnecessary strdup'ing in break_idx
777
- merge-ort: replace string_list_df_name_compare with faster alternative
778
917
- More fix-ups to "merge -sort".
779
+ More fix-ups and optimization to "merge -sort".
780
+
781
+ Will merge to 'next'.
782
783
920
-* zh/ref-filter-raw-data (2021-06-10) 4 commits
921
- - ref-filter: add %(rest) atom
922
- - ref-filter: use non-const ref_format in *_atom_parser()
923
- - ref-filter: add %(raw) atom
924
- - ref-filter: add obj-type check in grab contents
784
+* zh/ref-filter-raw-data (2021-06-16) 9 commits
785
+ . cat-file: re-implement --textconv, --filters options
786
+ . cat-file: reuse err buf in batch_objet_write()
787
+ . cat-file: reuse ref-filter logic
788
+ . ref-filter: introduce free_array_item_internal() function
789
+ . ref-filter: teach get_object() return useful value
790
+ . ref-filter: add %(rest) atom
791
+ . ref-filter: use non-const ref_format in *_atom_parser()
792
+ . ref-filter: add %(raw) atom
793
+ . ref-filter: add obj-type check in grab contents
794
795
Prepare the "ref-filter" machinery that drives the "--format"
796
option of "git for-each-ref" and its friends to be used in "git
797
cat-file --batch".
798
930
-
931
-* es/config-based-hooks (2021-05-27) 37 commits
932
- - docs: link githooks and git-hook manpages
933
- - doc: clarify fsmonitor-watchman specification
934
- - run-command: stop thinking about hooks
935
- - git-send-email: use 'git hook run' for 'sendemail-validate'
936
- - bugreport: use hook_exists instead of find_hook
937
- - receive-pack: convert receive hooks to hook.h
938
- - post-update: use hook.h library
939
- - proc-receive: acquire hook list from hook.h
940
- - receive-pack: convert 'update' hook to hook.h
941
- - reference-transaction: look for hooks in config
942
- - transport: convert pre-push hook to use config
943
- - hook: convert 'post-rewrite' hook to config
944
- - hooks: convert 'post-checkout' hook to hook library
945
- - git-p4: use 'git hook' to run hooks
946
- - receive-pack: convert push-to-checkout hook to hook.h
947
- - read-cache: convert post-index-change hook to use config
948
- - rebase: teach pre-rebase to use hook.h
949
- - gc: use hook library for pre-auto-gc hook
950
- - merge: use config-based hooks for post-merge hook
951
- - am: convert applypatch hooks to use config
952
- - commit: use config-based hooks
953
- - hooks: allow callers to capture output
954
- - run-command: allow capturing of collated output
955
- - hook: provide stdin by string_list or callback
956
- - run-command: add stdin callback for parallelization
957
- - hook: allow specifying working directory for hooks
958
- - hook: allow parallel hook execution
959
- - run-command: allow stdin for run_processes_parallel
960
- - hook: support passing stdin to hooks
961
- - hook: introduce hook_exists()
962
- - hook: add 'run' subcommand
963
- - parse-options: parse into strvec
964
- - hook: implement hookcmd.<name>.skip
965
- - hook: teach hook.runHookDir
966
- - hook: include hookdir hook in list
967
- - hook: introduce git-hook subcommand
968
- - doc: propose hooks managed by the config
799
+ This conflicts with the other topic on "cat-file --batch" by the
800
+ same author.
801
802
803
* jh/builtin-fsmonitor (2021-05-24) 30 commits
@@ -1003,6 +835,8 @@ Release tarballs are available at:
835
An attempt to write and ship with a watchman equivalent tailored
836
for our use.
837
838
+ What's the status of this one?
839
+
840
841
* es/trace2-log-parent-process-name (2021-06-09) 1 commit
842
- tr2: log parent process name
@@ -1040,6 +874,8 @@ Release tarballs are available at:
874
An option to render the manual pages via AsciiDoctor bypassing
875
xmlto has been introduced.
876
877
+ What is the status of this one?
878
+
879
880
* ab/fsck-unexpected-type (2021-05-21) 17 commits
881
. fsck: report invalid object type-path combinations
@@ -1064,3 +900,165 @@ Release tarballs are available at:
900
actual types of an object better.
901
902
Seems to break tests when merged to 'seen'.
903
+
904
+--------------------------------------------------
905
+[Will Discard]
906
+
907
+* ag/merge-strategies-in-c (2021-03-17) 15 commits
908
+ . sequencer: use the "octopus" merge strategy without forking
909
+ . sequencer: use the "resolve" strategy without forking
910
+ . merge: use the "octopus" strategy without forking
911
+ . merge: use the "resolve" strategy without forking
912
+ . merge-octopus: rewrite in C
913
+ . merge-recursive: move better_branch_name() to merge.c
914
+ . merge-resolve: rewrite in C
915
+ . merge-one-file: rewrite in C
916
+ . update-index: move add_cacheinfo() to read-cache.c
917
+ . merge-index: add a new way to invoke `git-merge-one-file'
918
+ . merge-index: drop the index
919
+ . merge-index: libify merge_one_path() and merge_all()
920
+ . t6060: add tests for removed files
921
+ . t6060: modify multiple files to expose a possible issue with merge-index
922
+ . t6407: modernise tests
923
+
924
+ The resolve and octopus merge strategy backends have been rewritten
925
+ in C.
926
+
927
+ Will discard.
928
+ We had to wait for a reroll for too long.
929
+ cf. <nycvar.QRO.7.76.6.2103241142220.50@tvgsbejvaqbjf.bet>
930
+
931
+
932
+* mr/bisect-in-c-4 (2021-04-11) 4 commits
933
+ . bisect--helper: retire `--bisect-next-check` subcommand
934
+ . bisect--helper: reimplement `bisect_run` shell function in C
935
+ . bisect--helper: reimplement `bisect_visualize()`shell function in C
936
+ . run-command: make `exists_in_PATH()` non-static
937
+
938
+ The codepaths involved in running "git bisect visualize" and "git
939
+ bisect run" has been rewritten in C.
940
+
941
+ Will discard.
942
+ We had to wait for a reroll for too long.
943
+ cf. <xmqq35vwh8qk.fsf@gitster.g>, <xmqqy2doftrj.fsf@gitster.g>,
944
+ <CAP8UFD3X24F3qgefHpi00PM-KUk+vcqxwy2Dbngbyj7ciavCVQ@mail.gmail.com>
945
+ May want to boost the test coverage.
946
+
947
+
948
+* ma/t0091-bugreport-fix (2021-04-12) 1 commit
949
+ . t0091-bugreport.sh: actually verify some content of report
950
+
951
+ Test fix.
952
+
953
+ Will discard.
954
+ We had to wait for a reroll for too long.
955
+ Expecting a reroll.
956
+ cf. <YHYZTLl90rkWWVOr@google.com>, <87a6q22dei.fsf@evledraar.gmail.com>
957
+
958
+
959
+* ls/fast-export-signed (2021-05-03) 5 commits
960
+ . fast-export, fast-import: add support for signed-commits
961
+ . fast-export: do not modify memory from get_commit_buffer
962
+ . git-fast-export.txt: clarify why 'verbatim' may not be a good idea
963
+ . fast-export: rename --signed-tags='warn' to 'warn-verbatim'
964
+ . git-fast-import.txt: add missing LF in the BNF
965
+
966
+ "git fast-export" offers a way to control how signed tags are
967
+ handled; the mechanism has been extended to allow specifying how
968
+ signed commits are handled as well.
969
+
970
+ Will discard.
971
+ We had to wait for a reroll for too long.
972
+ cf. <xmqqa6pca0pv.fsf@gitster.g>, <xmqq1rao9zev.fsf@gitster.g>
973
+
974
+
975
+* tb/multi-pack-bitmaps (2021-04-10) 23 commits
976
+ . p5326: perf tests for MIDX bitmaps
977
+ . p5310: extract full and partial bitmap tests
978
+ . midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
979
+ . t7700: update to work with MIDX bitmap test knob
980
+ . t5319: don't write MIDX bitmaps in t5319
981
+ . t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
982
+ . t5326: test multi-pack bitmap behavior
983
+ . t/helper/test-read-midx.c: add --checksum mode
984
+ . t5310: move some tests to lib-bitmap.sh
985
+ . pack-bitmap: write multi-pack bitmaps
986
+ . pack-bitmap: read multi-pack bitmaps
987
+ . pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
988
+ . pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
989
+ . pack-bitmap.c: introduce 'bitmap_num_objects()'
990
+ . midx: respect 'core.multiPackIndex' when writing
991
+ . midx: clear auxiliary .rev after replacing the MIDX
992
+ . midx: make a number of functions non-static
993
+ . Documentation: describe MIDX-based bitmaps
994
+ . Documentation: build 'technical/bitmap-format' by default
995
+ . pack-bitmap-write.c: free existing bitmaps
996
+ . pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
997
+ . pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps
998
+ . Merge branch 'tb/pack-preferred-tips-to-give-bitmap' into tb/multi-pack-bitmaps
999
+
1000
+ The reachability bitmap file used to be generated only for a single
1001
+ pack, but now we've learned to generate bitmaps for history that
1002
+ span across multiple packfiles.
1003
+
1004
+ Will discard.
1005
+ We had to wait for a reroll for too long.
1006
+ cf. <cover.1617991824.git.me@ttaylorr.com>
1007
+ Seems to break tests when merged to 'seen'.
1008
+
1009
+
1010
+* fc/neuter-doc (2021-06-14) 2 commits
1011
+ . comments: avoid using the gender of our users
1012
+ . doc: avoid using the gender of other people
1013
+
1014
+ An attempt to avoid gendered pronouns by rewriting parts of docs.
1015
+
1016
+ This seems to give more readable result than Stolee's "use singular
1017
+ they" topic.
1018
+
1019
+ Now will be part of the ds/gender-neutral-doc topic.
1020
+
1021
+
1022
+* es/config-based-hooks (2021-05-27) 37 commits
1023
+ . docs: link githooks and git-hook manpages
1024
+ . doc: clarify fsmonitor-watchman specification
1025
+ . run-command: stop thinking about hooks
1026
+ . git-send-email: use 'git hook run' for 'sendemail-validate'
1027
+ . bugreport: use hook_exists instead of find_hook
1028
+ . receive-pack: convert receive hooks to hook.h
1029
+ . post-update: use hook.h library
1030
+ . proc-receive: acquire hook list from hook.h
1031
+ . receive-pack: convert 'update' hook to hook.h
1032
+ . reference-transaction: look for hooks in config
1033
+ . transport: convert pre-push hook to use config
1034
+ . hook: convert 'post-rewrite' hook to config
1035
+ . hooks: convert 'post-checkout' hook to hook library
1036
+ . git-p4: use 'git hook' to run hooks
1037
+ . receive-pack: convert push-to-checkout hook to hook.h
1038
+ . read-cache: convert post-index-change hook to use config
1039
+ . rebase: teach pre-rebase to use hook.h
1040
+ . gc: use hook library for pre-auto-gc hook
1041
+ . merge: use config-based hooks for post-merge hook
1042
+ . am: convert applypatch hooks to use config
1043
+ . commit: use config-based hooks
1044
+ . hooks: allow callers to capture output
1045
+ . run-command: allow capturing of collated output
1046
+ . hook: provide stdin by string_list or callback
1047
+ . run-command: add stdin callback for parallelization
1048
+ . hook: allow specifying working directory for hooks
1049
+ . hook: allow parallel hook execution
1050
+ . run-command: allow stdin for run_processes_parallel
1051
+ . hook: support passing stdin to hooks
1052
+ . hook: introduce hook_exists()
1053
+ . hook: add 'run' subcommand
1054
+ . parse-options: parse into strvec
1055
+ . hook: implement hookcmd.<name>.skip
1056
+ . hook: teach hook.runHookDir
1057
+ . hook: include hookdir hook in list
1058
+ . hook: introduce git-hook subcommand
1059
+ . doc: propose hooks managed by the config
1060
+
1061
+ Propose hook scripts defined in the configuration.
1062
+
1063
+ Tentatively kicked out to give ab/config-based-hooks-base a chance
1064
+ to interact with other topics in flight.