What's cooking (2021/06 #05)
Junio C Hamano committed
Jun 15, 2021 at 17:18 UTC
8b018eb72d3c57d2b2e394f2e7b49cc554b56bd9
1 file changed
+423
-368
whats-cooking.txt
+423
-368
@@ -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, #04; Thu, 10)
4
-X-master-at: 211eca0895794362184da2be2a2d812d070719d3
5
-X-next-at: 62a8d224e6203d9d3d2d1d63a01cf5647ec312c9
3
+Subject: What's cooking in git.git (Jun 2021, #05; Tue, 15)
4
+X-master-at: 670b81a890388c60b7032a4f5b879f2ece8c4558
5
+X-next-at: b9a5e34162c5102e3c3898ea7d8bc369f6bb4390
6
7
-What's cooking in git.git (Jun 2021, #04; Thu, 10)
7
+What's cooking in git.git (Jun 2021, #05; Tue, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -19,11 +19,14 @@ 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
-The first batch of topics that have been cooking in 'next' are now
23
-in 'master'. They are all simple and obvious improvements. The
24
-next batch is expected to be more extensive. Also those topics that
25
-are not yet in 'next' but are marked to be merged to 'next' would
26
-stay out until the tip of 'next' gets rewound.
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.
30
31
Copies of the source code to Git live in many repositories, and the
32
following is a list of the ones I push into or their mirrors. Some
@@ -56,261 +59,317 @@ Release tarballs are available at:
59
--------------------------------------------------
60
[Graduated to 'master']
61
59
-* ah/doc-describe (2021-05-17) 1 commit
60
- (merged to 'next' on 2021-05-22 at 8f3925fd41)
61
- + describe-doc: clarify default length of abbreviation
62
-
63
- Doc update.
64
-
65
-
66
-* ah/fetch-reject-warning-grammofix (2021-05-20) 1 commit
67
- (merged to 'next' on 2021-05-28 at 09820da41b)
68
- + fetch: improve grammar of "shallow roots" message
69
-
70
- Message update.
71
-
72
-
73
-* ah/merge-usage-i18n-fix (2021-05-16) 1 commit
74
- (merged to 'next' on 2021-05-20 at e26a60d624)
75
- + merge: don't translate literal commands
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.)
76
77
- i18n update.
77
+ Test clean-up.
78
79
80
-* ah/setup-extensions-message-i18n-fix (2021-05-20) 1 commit
81
- (merged to 'next' on 2021-05-28 at 562b4e6f10)
82
- + setup: split "extensions found" messages into singular and plural
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
83
84
- Message update.
84
+ Workaround compiler warnings.
85
86
87
-* ah/stash-usage-i18n-fix (2021-05-17) 1 commit
88
- (merged to 'next' on 2021-05-20 at 68e6a46117)
89
- + stash: don't translate literal commands
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
90
91
- i18n update.
91
+ Test portability fix.
92
93
94
-* ah/submodule-helper-module-summary-parseopt (2021-05-17) 1 commit
95
- (merged to 'next' on 2021-05-20 at 928e72b83f)
96
- + submodule: use the imperative mood to describe the --files option
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()
100
98
- Message update.
101
+ Use the hashfile API in the codepath that writes the index file to
102
+ reduce code duplication.
103
104
101
-* ef/mailinfo-short-name (2021-05-17) 1 commit
102
- (merged to 'next' on 2021-05-20 at 5ee67911ea)
103
- + mailinfo: don't discard names under 3 characters
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.)
121
105
- We historically rejected a very short string as an author name
106
- while accepting a patch e-mail, which has been loosened.
122
+ Optimize out repeated rename detection in a sequence of mergy
123
+ operations.
124
125
109
-* jc/clarify-revision-range (2021-05-18) 1 commit
110
- (merged to 'next' on 2021-05-22 at 83a689d8ad)
111
- + revisions(7): clarify that most commands take a single revision range
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
133
113
- Doc update.
134
+ Preparatory build procedure clean-up for documentation.
135
136
116
-* jk/doc-color-pager (2021-05-20) 1 commit
117
- (merged to 'next' on 2021-05-28 at 52e4aa77df)
118
- + doc: explain the use of color.pager
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
140
120
- The documentation for "color.pager" configuration variable has been
121
- updated.
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.
146
147
124
-* jn/size-t-casted-to-off-t-fix (2021-05-19) 1 commit
125
- (merged to 'next' on 2021-05-20 at bbde7e6616)
126
- + xsize_t: avoid implementation defined behavior when len < 0
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
151
128
- Rewrite code that triggers undefined behaiour warning.
152
+ Recent "git clone" left a temporary directory behind when the
153
+ transport layer returned an failure.
154
155
131
-* mt/parallel-checkout-with-padded-oidcpy (2021-05-18) 1 commit
132
- (merged to 'next' on 2021-05-20 at 016cab0381)
133
- + parallel-checkout: send the new object_id algo field to the workers
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
159
135
- The parallel checkout codepath did not initialize object ID field
136
- used to talk to the worker processes in a futureproof way.
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.
163
164
139
-* ry/clarify-fast-forward-in-glossary (2021-05-19) 1 commit
140
- (merged to 'next' on 2021-05-22 at 97a851d59f)
141
- + docs: improve fast-forward in glossary content
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
168
143
- The description of "fast-forward" in the glossary has been updated.
169
+ Message update.
170
171
146
-* tl/fix-packfile-uri-doc (2021-05-25) 1 commit
147
- (merged to 'next' on 2021-05-25 at d047277014)
148
- + packfile-uri.txt: fix blobPackfileUri description
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"
184
150
- Doc fix.
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.
188
189
153
-* wm/rev-parse-die-i18n (2021-05-17) 1 commit
154
- (merged to 'next' on 2021-05-22 at 65c256d92b)
155
- + rev-parse: mark die() messages for translation
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.)
195
157
- Quite a many die() messages in rev-parse haven't been marked for
158
- translation.
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.
200
201
--------------------------------------------------
202
[New Topics]
203
163
-* ab/cmd-foo-should-return (2021-06-09) 1 commit
164
- - builtins + test helpers: use return instead of exit() in cmd_*
204
+* ah/uninitialized-reads-fix (2021-06-15) 3 commits
205
+ - builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
206
+ - split-index: use oideq instead of memcmp to compare object_id's
207
+ - bulk-checkin: make buffer reuse more obvious and safer
208
166
- Code clean-up.
209
+ Make the codebase MSAN clean.
210
211
Will merge to 'next'.
212
213
171
-* ab/progress-cleanup (2021-06-08) 1 commit
172
- - read-cache.c: don't guard calls to progress.c API
214
+* ar/typofix (2021-06-14) 1 commit
215
+ - *: fix typos which duplicate a word
216
174
- Code clean-up.
217
+ Typofixes.
218
219
Will merge to 'next'.
220
221
179
-* ab/test-tool-cache-cleanup (2021-06-08) 4 commits
180
- - read-cache perf: add a perf test for refresh_index()
181
- - test-tool: migrate read-cache-again to parse_options()
182
- - test-tool: migrate read-cache-perf to parse_options()
183
- - test-tool: split up test-tool read-cache
222
+* jk/revision-squelch-gcc-warning (2021-06-11) 1 commit
223
+ - add_pending_object_with_path(): work around "gcc -O3" complaint
224
185
- Test code shuffling.
225
+ Warning fix.
226
187
- Comments?
227
+ Will merge to 'next'.
228
229
190
-* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
191
- - xdiff: use BUG(...), not xdl_bug(...)
230
+* jk/union-merge-binary (2021-06-11) 3 commits
231
+ - ll_union_merge(): rename path_unused parameter
232
+ - ll_union_merge(): pass name labels to ll_xdl_merge()
233
+ - ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
234
193
- Code clean-up.
235
+ The "union" conflict resultion variant misbehaved when used with
236
+ binary merge driver.
237
238
Will merge to 'next'.
239
240
198
-* ar/test-code-cleanup (2021-06-08) 1 commit
199
- - t: fix whitespace around &&
241
+* js/no-more-multimail (2021-06-11) 1 commit
242
+ - multimail: stop shipping a copy
243
201
- Test code clean-up.
244
+ Remove multimail from contrib/
245
246
Will merge to 'next'.
247
248
206
-* ba/object-info (2021-06-08) 1 commit
207
- - protocol-caps.h: add newline at end of file
249
+* js/subtree-on-windows-fix (2021-06-15) 2 commits
250
+ - subtree: fix assumption about the directory separator
251
+ - subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
252
209
- Code clean-up.
253
+ Update "git subtree" to work better on Windows.
254
255
Will merge to 'next'.
256
257
214
-* dd/document-log-decorate-default (2021-06-08) 1 commit
215
- - doc/log: correct default for --decorate
216
-
217
- Doc clean-up.
218
-
219
- Will merge to 'next'.
258
+* jt/partial-clone-submodule-1 (2021-06-11) 5 commits
259
+ - promisor-remote: teach lazy-fetch in any repo
260
+ - run-command: refactor subprocess env preparation
261
+ - submodule: refrain from filtering GIT_CONFIG_COUNT
262
+ - promisor-remote: support per-repository config
263
+ - repository: move global r_f_p_c to repo struct
264
265
+ Prepare the internals for lazily fetching objects in submodules
266
+ from their promisor remotes.
267
222
-* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
223
- - doc: merge: mention default of defaulttoupstream
268
+ Waiting for reviews.
269
225
- Doc clean-up.
270
227
- Will merge to 'next'.
271
+* ab/mktag-tests (2021-06-15) 6 commits
272
+ - mktag tests: test fast-export
273
+ - mktag tests: test for-each-ref
274
+ - mktag tests: test update-ref and reachable fsck
275
+ - mktag tests: test hash-object --literally and unreachable fsck
276
+ - mktag tests: invert --no-strict test
277
+ - mktag tests: parse out options in helper
278
279
+ Fill test gaps.
280
230
-* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
231
- - mergetools/kdiff3: make kdiff3 work on Windows too
281
233
- On Windows, mergetool has been taught to find kdiff3.exe just like
234
- it finds winmerge.exe.
282
+* ab/show-branch-tests (2021-06-15) 4 commits
283
+ - show-branch tests: add missing tests
284
+ - show-branch: fix and test --color output
285
+ - show-branch tests: modernize test code
286
+ - show-branch tests: rename the one "show-branch" test file
287
236
- Will merge to 'next'.
288
+ Fill test gaps.
289
290
239
-* ab/pack-objects-stdin (2021-06-09) 4 commits
240
- - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
241
- - pack-objects.c: do stdin parsing via revision.c's API
242
- - revision.h: unify "disable_stdin" and "read_from_stdin"
243
- - upload-pack: run is_repository_shallow() before setup_revisions()
291
+* ah/graph-typofix (2021-06-15) 1 commit
292
+ - graph: improve grammar of "invalid color" error message
293
245
- Code clean-up.
294
+ Typofix in an error message.
295
247
- Comments?
296
+ Will merge to 'next'.
297
298
250
-* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
251
- - MyFirstContribution: link #git-devel to Libera Chat
299
+* es/superproject-aware-submodules (2021-06-14) 4 commits
300
+ - submodule: cache superproject gitdir during 'update'
301
+ - submodule: cache superproject gitdir during absorbgitdirs
302
+ - introduce submodule.superprojectGitDir cache
303
+ - t7400-submodule-basic: modernize inspect() helper
304
253
- Update MyFirst document.
305
+ A configuration variable in a submodule points at the location of
306
+ the superproject it is bound to (RFC).
307
255
- Will merge to 'next'.
308
+ Waiting for reviews.
309
310
258
-* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
259
- - mailinfo: use starts_with() when checking scissors
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
261
- Code clean-up.
315
+ An attempt to avoid gendered pronouns by rewriting parts of docs.
316
263
- Will merge to 'next'.
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
266
-* ar/submodule-add (2021-06-09) 2 commits
267
- - submodule--helper: introduce add-config subcommand
268
- - submodule--helper: introduce add-clone subcommand
322
270
- Rewrite of "git submodule" in C continues.
323
+* fc/pull-cleanups (2021-06-15) 3 commits
324
+ - pull: trivial whitespace style fix
325
+ - pull: trivial cleanup
326
+ - pull: cleanup autostash check
327
272
- Comments?
328
+ Code cleanup.
329
330
+ Will merge to 'next'.
331
275
-* ds/gender-neutral-doc (2021-06-10) 4 commits
276
- - CodingGuidelines: recommend singular they
277
- - *: fix typos
278
- - *: use singular they in comments
279
- - Documentation: use singular they when appropriate
332
281
- Attempt to update the documentation not to assume users are of
282
- certain gender and adds to guidelines to do so.
333
+* jk/bitmap-tree-optim (2021-06-15) 1 commit
334
+ - bitmaps: don't recurse into trees already in the bitmap
335
284
- Will wait for conclusion of the on-list discussion.
336
+ Avoid duplicated work while building reachability bitmaps.
337
338
+ Will merge to 'next'.
339
287
-* gh/gitweb-branch-sort (2021-06-10) 1 commit
288
- - gitweb: use HEAD as secondary sort key in git_get_heads_list()
340
290
- Tie-break branches that point at the same object in the list of
291
- branches on GitWeb to show the one pointed at by HEAD early.
341
+* jx/t6020-with-older-bash (2021-06-14) 1 commit
342
+ - t6020: fix bash incompatible issue
343
293
- Comments?
344
+ Work around inefficient glob substitution in older versions of bash
345
+ by rewriting parts of a test.
346
347
296
-* jk/doc-max-pack-size (2021-06-09) 1 commit
297
- - doc: warn people against --max-pack-size
348
+* en/zdiff3 (2021-06-15) 2 commits
349
+ - update documentation for new zdiff3 conflictStyle
350
+ - xdiff: implement a zealous diff3, or "zdiff3"
351
299
- Doc update.
352
+ "Zealous diff3" style of merge conflict presentation has been added.
353
301
- Will merge to 'next'.
354
+ Waiting for reviews.
355
356
304
-* lh/systemd-timers (2021-06-09) 3 commits
305
- - maintenance: add support for systemd timers on Linux
306
- - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
307
- - cache.h: Introduce a generic "xdg_config_home_for(…)" function
357
+* pw/diff-color-moved-fix (2021-06-15) 10 commits
358
+ - diff --color-moved: intern strings
359
+ - diff --color-moved-ws=allow-indentation-change: improve hash lookups
360
+ - diff --color-moved: stop clearing potential moved blocks
361
+ - diff --color-moved: shrink potential moved blocks as we go
362
+ - diff --color-moved: unify moved block growth functions
363
+ - diff --color-moved: call comparison function directly
364
+ - diff --color-moved-ws=allow-indentation-change: simplify and optimize
365
+ - diff: simplify allow-indentation-change delta calculation
366
+ - diff --color-moved: avoid false short line matches and bad zebra coloring
367
+ - diff --color-moved=zebra: fix alternate coloring
368
309
- "git maintenance" scheduler learned to use systemd timers as a
310
- possible backend.
369
+ Long-overdue correctness and performance update to "diff
370
+ --color-moved" feature.
371
312
- Expecting a reroll.
313
- cf. <YMCLQ5pOyg+SSKhD@coredump.intra.peff.net>
372
+ Waiting for reviews.
373
374
--------------------------------------------------
375
[Stalled]
@@ -424,22 +483,6 @@ Release tarballs are available at:
483
Seems to break tests when merged to 'seen'.
484
485
427
-* hn/refs-errno-cleanup (2021-04-30) 8 commits
428
- - refs: explicitly propagate errno from refs_read_raw_ref
429
- - refs: stop setting EINVAL and ELOOP in symref resolution
430
- - refs: clear errno return in refs_resolve_ref_unsafe()
431
- - refs: add failure_errno to refs_read_raw_ref() signature
432
- - refs: make errno output explicit for refs_resolve_ref_unsafe
433
- - refs: make errno output explicit for read_raw_ref_fn
434
- - refs/files-backend: stop setting errno from lock_ref_oid_basic
435
- - refs: remove EINVAL specification from the errno sideband in read_raw_ref_fn
436
-
437
- Futz with the way 'errno' is relied on in the refs API to carry the
438
- failure modes up the callchain.
439
-
440
- Waiting for reviews.
441
-
442
-
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
@@ -482,6 +525,8 @@ Release tarballs are available at:
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
@@ -502,6 +547,8 @@ Release tarballs are available at:
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"
@@ -509,11 +556,10 @@ Release tarballs are available at:
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
512
- (this branch uses ab/test-lib-updates.)
559
560
Various updates to tests around "git describe"
561
516
- Waiting for the base topic to solidify.
562
+ Will merge to 'next'.
563
564
565
* ab/pickaxe-pcre2 (2021-05-11) 22 commits
@@ -539,52 +585,220 @@ Release tarballs are available at:
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
542
- (this branch uses ab/test-lib-updates.)
588
589
Rewrite the backend for "diff -G/-S" to use pcre2 engine when
590
available.
591
547
- Waiting for the base topic to solidify.
592
+ Will merge to 'next'.
593
594
--------------------------------------------------
595
[Cooking]
596
552
-* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
553
- - t: use user-specified utf-8 locale for testing svn
597
+* hn/refs-errno-cleanup (2021-06-11) 8 commits
598
+ - refs: explicitly propagate errno from refs_read_raw_ref
599
+ - refs: clear errno return in refs_resolve_ref_unsafe()
600
+ - refs: add failure_errno to refs_read_raw_ref() signature
601
+ - refs: use refs_resolve_ref_unsafe_with_errno() where needed
602
+ - refs: make errno output explicit for refs_resolve_ref_unsafe
603
+ - refs: make errno output explicit for read_raw_ref_fn
604
+ - refs/files-backend: stop setting errno from lock_ref_oid_basic
605
+ - refs: remove EINVAL errno output from specification of read_raw_ref_fn
606
555
- "git-svn" tests assumed that "locale -a", which is used to pick an
556
- available UTF-8 locale, is available everywhere. A knob has been
557
- introduced to allow testers to specify a suitable locale to use.
607
+ Futz with the way 'errno' is relied on in the refs API to carry the
608
+ failure modes up the callchain.
609
559
- Will merge to 'next'.
610
+ Will merge to 'next'?
611
612
562
-* fc/completion-updates (2021-06-07) 4 commits
563
- - completion: bash: add correct suffix in variables
564
- - completion: bash: fix for multiple dash commands
565
- - completion: bash: fix for suboptions with value
566
- - completion: bash: fix prefix detection in branch.*
613
+* ab/cmd-foo-should-return (2021-06-09) 1 commit
614
+ - builtins + test helpers: use return instead of exit() in cmd_*
615
568
- Command line completion updates.
616
+ Code clean-up.
617
570
- Expecting a reroll.
571
- cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
618
+ Will merge to 'next'.
619
620
574
-* mr/cmake (2021-06-07) 3 commits
575
- - cmake: add warning for ignored MSGFMT_EXE
576
- - cmake: create compile_commands.json by default
577
- - cmake: add knob to disable vcpkg
621
+* ab/progress-cleanup (2021-06-08) 1 commit
622
+ - read-cache.c: don't guard calls to progress.c API
623
579
- CMake update.
624
+ Code clean-up.
625
626
Will merge to 'next'.
627
628
584
-* ab/update-submitting-patches (2021-06-08) 3 commits
585
- - SubmittingPatches: remove pine-specific hints from MUA hints
586
- - SubmittingPatches: replace discussion of Travis with GitHub Actions
587
- - SubmittingPatches: move discussion of Signed-off-by above "send"
629
+* ab/test-tool-cache-cleanup (2021-06-08) 4 commits
630
+ - read-cache perf: add a perf test for refresh_index()
631
+ - test-tool: migrate read-cache-again to parse_options()
632
+ - test-tool: migrate read-cache-perf to parse_options()
633
+ - test-tool: split up test-tool read-cache
634
+
635
+ Test code shuffling.
636
+
637
+ Waiting for reviews.
638
+
639
+
640
+* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
641
+ - xdiff: use BUG(...), not xdl_bug(...)
642
+
643
+ Code clean-up.
644
+
645
+ Will merge to 'next'.
646
+
647
+
648
+* ar/test-code-cleanup (2021-06-08) 1 commit
649
+ - t: fix whitespace around &&
650
+
651
+ Test code clean-up.
652
+
653
+ Will merge to 'next'.
654
+
655
+
656
+* ba/object-info (2021-06-08) 1 commit
657
+ - protocol-caps.h: add newline at end of file
658
+
659
+ Code clean-up.
660
+
661
+ Will merge to 'next'.
662
+
663
+
664
+* dd/document-log-decorate-default (2021-06-08) 1 commit
665
+ - doc/log: correct default for --decorate
666
+
667
+ Doc clean-up.
668
+
669
+ Will merge to 'next'.
670
+
671
+
672
+* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
673
+ - doc: merge: mention default of defaulttoupstream
674
+
675
+ Doc clean-up.
676
+
677
+ Will merge to 'next'.
678
+
679
+
680
+* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
681
+ - mergetools/kdiff3: make kdiff3 work on Windows too
682
+
683
+ On Windows, mergetool has been taught to find kdiff3.exe just like
684
+ it finds winmerge.exe.
685
+
686
+ Will merge to 'next'.
687
+
688
+
689
+* ab/pack-objects-stdin (2021-06-09) 4 commits
690
+ - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
691
+ - pack-objects.c: do stdin parsing via revision.c's API
692
+ - revision.h: unify "disable_stdin" and "read_from_stdin"
693
+ - upload-pack: run is_repository_shallow() before setup_revisions()
694
+
695
+ Code clean-up.
696
+
697
+ Waiting for reviews.
698
+
699
+
700
+* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
701
+ - MyFirstContribution: link #git-devel to Libera Chat
702
+
703
+ Update MyFirst document.
704
+
705
+ Will merge to 'next'.
706
+
707
+
708
+* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
709
+ - mailinfo: use starts_with() when checking scissors
710
+
711
+ Code clean-up.
712
+
713
+ Will merge to 'next'.
714
+
715
+
716
+* ar/submodule-add (2021-06-15) 3 commits
717
+ - submodule--helper: introduce add-config subcommand
718
+ - submodule--helper: introduce add-clone subcommand
719
+ - submodule--helper: refactor module_clone()
720
+
721
+ Rewrite of "git submodule" in C continues.
722
+
723
+ Waiting for reviews.
724
+
725
+
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
731
+
732
+ Attempt to update the documentation not to assume users are of
733
+ certain gender and adds to guidelines to do so.
734
+
735
+ Will wait for conclusion of the on-list discussion.
736
+
737
+
738
+* gh/gitweb-branch-sort (2021-06-10) 1 commit
739
+ - gitweb: use HEAD as secondary sort key in git_get_heads_list()
740
+
741
+ Tie-break branches that point at the same object in the list of
742
+ branches on GitWeb to show the one pointed at by HEAD early.
743
+
744
+ Waiting for reviews.
745
+
746
+
747
+* jk/doc-max-pack-size (2021-06-09) 1 commit
748
+ - doc: warn people against --max-pack-size
749
+
750
+ Doc update.
751
+
752
+ Will merge to 'next'.
753
+
754
+
755
+* lh/systemd-timers (2021-06-14) 3 commits
756
+ - maintenance: add support for systemd timers on Linux
757
+ - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
758
+ - cache.h: Introduce a generic "xdg_config_home_for(…)" function
759
+
760
+ "git maintenance" scheduler learned to use systemd timers as a
761
+ possible backend.
762
+
763
+ Waiting for reviews.
764
+
765
+
766
+* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
767
+ - t: use user-specified utf-8 locale for testing svn
768
+
769
+ "git-svn" tests assumed that "locale -a", which is used to pick an
770
+ available UTF-8 locale, is available everywhere. A knob has been
771
+ introduced to allow testers to specify a suitable locale to use.
772
+
773
+ Will merge to 'next'.
774
+
775
+
776
+* fc/completion-updates (2021-06-07) 4 commits
777
+ - completion: bash: add correct suffix in variables
778
+ - completion: bash: fix for multiple dash commands
779
+ - completion: bash: fix for suboptions with value
780
+ - completion: bash: fix prefix detection in branch.*
781
+
782
+ Command line completion updates.
783
+
784
+ Expecting a reroll.
785
+ cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
786
+
787
+
788
+* mr/cmake (2021-06-11) 3 commits
789
+ - cmake: add warning for ignored MSGFMT_EXE
790
+ - cmake: create compile_commands.json by default
791
+ - cmake: add knob to disable vcpkg
792
+
793
+ CMake update.
794
+
795
+ Will merge to 'next'.
796
+
797
+
798
+* ab/update-submitting-patches (2021-06-08) 3 commits
799
+ - SubmittingPatches: remove pine-specific hints from MUA hints
800
+ - SubmittingPatches: replace discussion of Travis with GitHub Actions
801
+ - SubmittingPatches: move discussion of Signed-off-by above "send"
802
803
Reorganize and update the SubmitingPatches document.
804
@@ -699,34 +913,21 @@ Release tarballs are available at:
913
- Fix various issues found in comments
914
- diffcore-rename: avoid unnecessary strdup'ing in break_idx
915
- merge-ort: replace string_list_df_name_compare with faster alternative
702
- (this branch uses en/ort-perf-batch-11.)
916
+
917
+ More fix-ups to "merge -sort".
918
919
920
* zh/ref-filter-raw-data (2021-06-10) 4 commits
706
- . ref-filter: add %(rest) atom
707
- . ref-filter: use non-const ref_format in *_atom_parser()
708
- . ref-filter: add %(raw) atom
709
- . ref-filter: add obj-type check in grab contents
710
- (this branch uses zh/ref-filter-atom-type.)
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
925
926
Prepare the "ref-filter" machinery that drives the "--format"
927
option of "git for-each-ref" and its friends to be used in "git
928
cat-file --batch".
929
930
717
-* fc/doc-build-cleanup (2021-05-24) 5 commits
718
- (merged to 'next' on 2021-05-31 at af103e12f4)
719
- + doc: avoid using rm directly
720
- + doc: simplify Makefile using .DELETE_ON_ERROR
721
- + doc: remove unnecessary rm instances
722
- + doc: improve asciidoc dependencies
723
- + doc: refactor common asciidoc dependencies
724
-
725
- Preparatory build procedure clean-up for documentation.
726
-
727
- Will merge to 'master'.
728
-
729
-
931
* es/config-based-hooks (2021-05-27) 37 commits
932
- docs: link githooks and git-hook manpages
933
- doc: clarify fsmonitor-watchman specification
@@ -803,47 +1004,13 @@ Release tarballs are available at:
1004
for our use.
1005
1006
806
-* dd/honor-users-tar-in-tests (2021-05-22) 1 commit
807
- (merged to 'next' on 2021-05-28 at 56961581ce)
808
- + t: use configured TAR instead of tar
809
-
810
- Test portability fix.
811
-
812
- Will merge to 'master'.
813
-
814
-
815
-* jk/clone-clean-upon-transport-error (2021-05-19) 1 commit
816
- (merged to 'next' on 2021-05-22 at 464b1f187c)
817
- + clone: clean up directory after transport_fetch_refs() failure
818
-
819
- Recent "git clone" left a temporary directory behind when the
820
- transport layer returned an failure.
821
-
822
- Will cook in 'next'.
823
-
824
-
825
-* jk/fetch-pack-v2-half-close-early (2021-05-20) 1 commit
826
- (merged to 'next' on 2021-05-28 at 56e97ec2df)
827
- + fetch-pack: signal v2 server that we are done making requests
828
-
829
- "git fetch" over protocol v2 left its side of the socket open after
830
- it finished speaking, which unnecessarily wasted the resource on
831
- the other side.
832
-
833
- Will cook in 'next'.
834
-
835
-
1007
* es/trace2-log-parent-process-name (2021-06-09) 1 commit
1008
- tr2: log parent process name
1009
1010
+ trace2 logs learned to show parent process name to see in what
1011
+ context Git was invoked.
1012
840
-* ps/rev-list-object-type-filter (2021-05-21) 1 commit
841
- (merged to 'next' on 2021-05-28 at f22e938f3e)
842
- + help: fix small typo in error message
843
-
844
- Message update.
845
-
846
- Will cook in 'next'.
1013
+ Will merge to 'next'?
1014
1015
1016
* ab/send-email-optim (2021-05-28) 13 commits
@@ -866,66 +1033,6 @@ Release tarballs are available at:
1033
Will merge to 'next'.
1034
1035
869
-* zh/ref-filter-atom-type (2021-05-14) 2 commits
870
- (merged to 'next' on 2021-05-16 at 48fd717185)
871
- + ref-filter: introduce enum atom_type
872
- + ref-filter: add objectsize to used_atom
873
- (this branch is used by zh/ref-filter-raw-data.)
874
-
875
- The code to handle the "--format" option in "for-each-ref" and
876
- friends made too many string comparisons on %(atom)s used in the
877
- format string, which has been corrected by converting them into
878
- enum when the format string is parsed.
879
-
880
- Will cook in 'next'.
881
-
882
-
883
-* ga/send-email-sendmail-cmd (2021-05-17) 1 commit
884
- (merged to 'next' on 2021-05-22 at 755df67f0e)
885
- + git-send-email: add option to specify sendmail command
886
-
887
- "git send-email" learned the "--sendmail-cmd" command line option
888
- and the "sendemail.sendmailCmd" configuration variable, which is a
889
- more sensible approach than the current way of repurposing the
890
- "smtp-server" that is meant to name the server to instead name the
891
- command to talk to the server.
892
-
893
- Will cook in 'next'.
894
-
895
-
896
-* ds/write-index-with-hashfile-api (2021-05-19) 4 commits
897
- (merged to 'next' on 2021-05-28 at f0c51ddf7c)
898
- + read-cache: delete unused hashing methods
899
- + read-cache: use hashfile instead of git_hash_ctx
900
- + csum-file.h: increase hashfile buffer size
901
- + hashfile: use write_in_full()
902
-
903
- Use the hashfile API in the codepath that writes the index file to
904
- reduce code duplication.
905
-
906
- Will cook in 'next'.
907
-
908
-
909
-* so/log-m-implies-p (2021-05-21) 10 commits
910
- (merged to 'next' on 2021-05-28 at 2733ec2409)
911
- + diff-merges: let "-m" imply "-p"
912
- + diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
913
- + stash list: stop passing "-m" to "git log"
914
- + git-svn: stop passing "-m" to "git rev-list"
915
- + diff-merges: move specific diff-index "-m" handling to diff-index
916
- + t4013: test "git diff-index -m"
917
- + t4013: test "git diff-tree -m"
918
- + t4013: test "git log -m --stat"
919
- + t4013: test "git log -m --raw"
920
- + t4013: test that "-m" alone has no effect in "git log"
921
-
922
- The "-m" option in "git log -m" that does not specify which format,
923
- if any, of diff is desired did not have any visible effect; it now
924
- implies some form of diff (by default "--patch") is produced.
925
-
926
- Will cook in 'next'.
927
-
928
-
1036
* bc/doc-asciidoctor-to-man-wo-xmlto (2021-05-14) 2 commits
1037
- doc: remove GNU_ROFF option
1038
- doc: add an option to have Asciidoctor build man pages directly
@@ -934,58 +1041,6 @@ Release tarballs are available at:
1041
xmlto has been introduced.
1042
1043
937
-* ab/trace2-squelch-gcc-warning (2021-05-21) 1 commit
938
- (merged to 'next' on 2021-05-28 at 6c7a015f99)
939
- + trace2: refactor to avoid gcc warning under -O3
940
-
941
- Workaround compiler warnings.
942
-
943
- Will merge to 'master'.
944
-
945
-
946
-* en/ort-perf-batch-11 (2021-05-20) 13 commits
947
- (merged to 'next' on 2021-05-28 at 58a8b85d6a)
948
- + merge-ort, diffcore-rename: employ cached renames when possible
949
- + merge-ort: handle interactions of caching and rename/rename(1to1) cases
950
- + merge-ort: add helper functions for using cached renames
951
- + merge-ort: preserve cached renames for the appropriate side
952
- + merge-ort: avoid accidental API mis-use
953
- + merge-ort: add code to check for whether cached renames can be reused
954
- + merge-ort: populate caches of rename detection results
955
- + merge-ort: add data structures for in-memory caching of rename detection
956
- + t6429: testcases for remembering renames
957
- + fast-rebase: write conflict state to working tree, index, and HEAD
958
- + fast-rebase: change assert() to BUG()
959
- + Documentation/technical: describe remembering renames optimization
960
- + t6423: rename file within directory that other side renamed
961
- (this branch is used by en/ort-perf-batch-12.)
962
-
963
- Optimize out repeated rename detection in a sequence of mergy
964
- operations.
965
-
966
- Will cook in 'next'.
967
-
968
-
969
-* ab/test-lib-updates (2021-05-11) 11 commits
970
- (merged to 'next' on 2021-05-31 at 73bf1ecb31)
971
- + test-lib: split up and deprecate test_create_repo()
972
- + test-lib: do not show advice about init.defaultBranch under --verbose
973
- + test-lib: reformat argument list in test_create_repo()
974
- + submodule tests: use symbolic-ref --short to discover branch name
975
- + test-lib functions: add --printf option to test_commit
976
- + describe tests: convert setup to use test_commit
977
- + test-lib functions: add an --annotated option to "test_commit"
978
- + test-lib-functions: document test_commit --no-tag
979
- + test-lib-functions: reword "test_commit --append" docs
980
- + test-lib tests: remove dead GIT_TEST_FRAMEWORK_SELFTEST variable
981
- + test-lib: bring $remove_trash out of retirement
982
- (this branch is used by ab/describe-tests-fix and ab/pickaxe-pcre2.)
983
-
984
- Test clean-up.
985
-
986
- Will cook in 'next'.
987
-
988
-
1044
* ab/fsck-unexpected-type (2021-05-21) 17 commits
1045
. fsck: report invalid object type-path combinations
1046
. fsck: report invalid types recorded in objects