What's cooking (2021/05 #06)
Junio C Hamano committed
May 28, 2021 at 15:09 UTC
4b70489538fd1436b49902f05607e294b1e79319
1 file changed
+414
-326
whats-cooking.txt
+414
-326
@@ -1,24 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2021, #05; Sat, 22)
4
-X-master-at: de88ac70f3a801262eb3aa087e5d9a712be0a54a
5
-X-next-at: 3cb6fa43cd00a825d13bf67004b2df69d9efb73b
3
+Subject: What's cooking in git.git (May 2021, #06; Fri, 28)
4
+X-master-at: 4e42405f00ecbbee412846f48cb0253efeebe726
5
+X-next-at: 280156cefb2268b8300e6278adc4f77af04d439f
6
7
-What's cooking in git.git (May 2021, #05; Sat, 22)
7
+What's cooking in git.git (May 2021, #06; Fri, 28)
8
--------------------------------------------------
9
10
-Here are the topics that have been cooking. Commits prefixed with '-' are
11
-only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
12
-with '+' are in 'next'. The ones marked with '.' do not appear in any of
13
-the integration branches, but I am still holding onto them.
10
+Here are the topics that have been cooking in my tree. Commits
11
+prefixed with '-' are only in 'seen' (which collects random set of
12
+topics that are not yet in 'next') while commits prefixed with '+'
13
+are in 'next'. The ones marked with '.' do not appear in any of the
14
+integration branches, but I am still holding onto them.
15
15
-The Git 2.32-rc1 has been tagged for testing. From now on, please
16
-allocate some bandwidth for finding and fixing regressions in what
17
-is already in the release candidates, rather than new stuff. I may
18
-still pick up new topics that are not yet anywhere in my tree, and
19
-an update of topics that are queued in 'seen', but only on "time
20
-permits" basis---fixes to what happened between v2.31.0..master get
21
-higher priority than all the rest.
16
+The second release candidate Git 2.32-rc2 has been tagged.
17
18
Copies of the source code to Git live in many repositories, and the
19
following is a list of the ones I push into or their mirrors. Some
@@ -51,42 +46,314 @@ Release tarballs are available at:
46
--------------------------------------------------
47
[Graduated to 'master']
48
54
-* dl/stash-show-untracked-fixup (2021-05-22) 1 commit
55
- (merged to 'next' on 2021-05-22 at bbe06ef834)
56
- + stash show: use stash.showIncludeUntracked even when diff options given
49
+* ab/pack-linkage-fix (2021-05-27) 1 commit
50
+ (merged to 'next' on 2021-05-27 at 120d76a959)
51
+ + pack-objects: move static inline from a header to the sole consumer
52
58
- Another brown paper bag inconsistency fix for a new feature
59
- introduced during this cycle.
53
+ "ld" on Solaris fails to link some test helpers, which has been
54
+ worked around by reshuffling the inline function definitions from a
55
+ header file to a source file that is the only user of them.
56
57
62
-* jh/simple-ipc-sans-pthread (2021-05-21) 1 commit
63
- (merged to 'next' on 2021-05-22 at 4332dd2012)
64
- + simple-ipc: correct ifdefs when NO_PTHREADS is defined
58
+* ab/send-email-inline-hooks-path (2021-05-27) 2 commits
59
+ (merged to 'next' on 2021-05-27 at 402272f99e)
60
+ + send-email: move "hooks_path" invocation to git-send-email.perl
61
+ + send-email: don't needlessly abs_path() the core.hooksPath
62
66
- The "simple-ipc" did not compile without pthreads support, but the
67
- build procedure was not properly account for it.
63
+ Code simplification.
64
65
70
-* wm/rev-parse-path-format-wo-arg (2021-05-17) 1 commit
71
- (merged to 'next' on 2021-05-20 at 5d3c8ba2bf)
72
- + rev-parse: fix segfault with missing --path-format argument
73
- (this branch is used by wm/rev-parse-die-i18n.)
66
+* ab/send-email-validate-errors-fix (2021-05-25) 1 commit
67
+ (merged to 'next' on 2021-05-25 at 1e78c17669)
68
+ + send-email: fix missing error message regression
69
75
- The "rev-parse" command did not diagnose the lack of argument to
76
- "--path-format" option, which was introduced in v2.31 era, which
77
- has been corrected.
70
+
71
+* ds/t1092-fix-flake-from-progress (2021-05-26) 2 commits
72
+ (merged to 'next' on 2021-05-26 at 5c116071b1)
73
+ + t1092: revert the "-1" hack for emulating "no progress meter"
74
+ (merged to 'next' on 2021-05-26 at 3a1982b559)
75
+ + t1092: use GIT_PROGRESS_DELAY for consistent results
76
+
77
+ Workaround flaky tests introduced recently.
78
+
79
+
80
+* en/dir-traversal (2021-05-27) 4 commits
81
+ (merged to 'next' on 2021-05-27 at 3e70b5a671)
82
+ + dir: introduce readdir_skip_dot_and_dotdot() helper
83
+ + dir: update stale description of treat_directory()
84
+ + Revert "dir: update stale description of treat_directory()"
85
+ + Revert "dir: introduce readdir_skip_dot_and_dotdot() helper"
86
+
87
+ Fix-up to a topic that is already in 'master'.
88
+
89
+
90
+* jt/send-email-validate-errors-fix (2021-05-25) 1 commit
91
+ (merged to 'next' on 2021-05-25 at f7659a41c8)
92
+ + t9001-send-email.sh: fix expected absolute paths on Windows
93
+
94
+ Fix a test breakage.
95
+
96
+
97
+* mt/init-template-userpath-fix (2021-05-25) 1 commit
98
+ (merged to 'next' on 2021-05-25 at a1b42bf271)
99
+ + init: fix bug regarding ~/ expansion in init.templateDir
100
+
101
+ Regression fix.
102
+
103
+
104
+* mt/t2080-cp-symlink-fix (2021-05-27) 1 commit
105
+ (merged to 'next' on 2021-05-27 at 0b90c816b3)
106
+ + t2080: fix cp invocation to copy symlinks instead of following them
107
+
108
+ Test portability fix.
109
110
--------------------------------------------------
111
[New Topics]
112
82
-* dd/honor-users-tar-in-tests (2021-05-22) 1 commit
83
- - t: use configured TAR instead of tar
113
+* zh/ref-filter-raw-data (2021-05-25) 4 commits
114
+ - ref-filter: add contents:raw atom
115
+ - SQUASH???
116
+ - ref-filter: support %(contents) for blob, tree
117
+ - quote: add *.quote_buf_with_size functions
118
+
119
+ Prepare the "ref-filter" machinery that drives the "--format"
120
+ option of "git for-each-ref" and its friends to be used in "git
121
+ cat-file --batch".
122
+
123
+ Seems to break tests when merged to 'seen'.
124
+
125
+
126
+* fc/doc-build-cleanup (2021-05-24) 5 commits
127
+ - doc: avoid using rm directly
128
+ - doc: simplify Makefile using .DELETE_ON_ERROR
129
+ - doc: remove unnecessary rm instances
130
+ - doc: improve asciidoc dependencies
131
+ - doc: refactor common asciidoc dependencies
132
+
133
+ Preparatory build procedure clean-up for documentation.
134
+
135
+ Will merge to 'next'.
136
85
- Test portability fix.
137
+
138
+* es/config-based-hooks (2021-05-27) 37 commits
139
+ - docs: link githooks and git-hook manpages
140
+ - doc: clarify fsmonitor-watchman specification
141
+ - run-command: stop thinking about hooks
142
+ - git-send-email: use 'git hook run' for 'sendemail-validate'
143
+ - bugreport: use hook_exists instead of find_hook
144
+ - receive-pack: convert receive hooks to hook.h
145
+ - post-update: use hook.h library
146
+ - proc-receive: acquire hook list from hook.h
147
+ - receive-pack: convert 'update' hook to hook.h
148
+ - reference-transaction: look for hooks in config
149
+ - transport: convert pre-push hook to use config
150
+ - hook: convert 'post-rewrite' hook to config
151
+ - hooks: convert 'post-checkout' hook to hook library
152
+ - git-p4: use 'git hook' to run hooks
153
+ - receive-pack: convert push-to-checkout hook to hook.h
154
+ - read-cache: convert post-index-change hook to use config
155
+ - rebase: teach pre-rebase to use hook.h
156
+ - gc: use hook library for pre-auto-gc hook
157
+ - merge: use config-based hooks for post-merge hook
158
+ - am: convert applypatch hooks to use config
159
+ - commit: use config-based hooks
160
+ - hooks: allow callers to capture output
161
+ - run-command: allow capturing of collated output
162
+ - hook: provide stdin by string_list or callback
163
+ - run-command: add stdin callback for parallelization
164
+ - hook: allow specifying working directory for hooks
165
+ - hook: allow parallel hook execution
166
+ - run-command: allow stdin for run_processes_parallel
167
+ - hook: support passing stdin to hooks
168
+ - hook: introduce hook_exists()
169
+ - hook: add 'run' subcommand
170
+ - parse-options: parse into strvec
171
+ - hook: implement hookcmd.<name>.skip
172
+ - hook: teach hook.runHookDir
173
+ - hook: include hookdir hook in list
174
+ - hook: introduce git-hook subcommand
175
+ - doc: propose hooks managed by the config
176
177
--------------------------------------------------
178
[Stalled]
179
180
+* mr/bisect-in-c-4 (2021-04-11) 4 commits
181
+ - bisect--helper: retire `--bisect-next-check` subcommand
182
+ - bisect--helper: reimplement `bisect_run` shell function in C
183
+ - bisect--helper: reimplement `bisect_visualize()`shell function in C
184
+ - run-command: make `exists_in_PATH()` non-static
185
+
186
+ The codepaths involved in running "git bisect visualize" and "git
187
+ bisect run" has been rewritten in C.
188
+
189
+ Expecting a reroll.
190
+ cf. <xmqq35vwh8qk.fsf@gitster.g>, <xmqqy2doftrj.fsf@gitster.g>,
191
+ <CAP8UFD3X24F3qgefHpi00PM-KUk+vcqxwy2Dbngbyj7ciavCVQ@mail.gmail.com>
192
+ May want to boost the test coverage.
193
+
194
+
195
+* hn/reftable (2021-05-20) 28 commits
196
+ - t1404: annotate test cases with REFFILES
197
+ - t1401,t2011: parameterize HEAD.lock for REFTABLE
198
+ - t1301: document what needs to be done for REFTABLE
199
+ - Add "test-tool dump-reftable" command.
200
+ - git-prompt: prepare for reftable refs backend
201
+ - Reftable support for git-core
202
+ - reftable: add dump utility
203
+ - reftable: implement stack, a mutable database of reftable files.
204
+ - reftable: implement refname validation
205
+ - reftable: add merged table view
206
+ - reftable: add a heap-based priority queue for reftable records
207
+ - reftable: reftable file level tests
208
+ - reftable: read reftable files
209
+ - reftable: generic interface to tables
210
+ - reftable: write reftable files
211
+ - reftable: a generic binary tree implementation
212
+ - reftable: reading/writing blocks
213
+ - Provide zlib's uncompress2 from compat/zlib-compat.c
214
+ - reftable: (de)serialization for the polymorphic record type.
215
+ - reftable: add blocksource, an abstraction for random access reads
216
+ - reftable: utility functions
217
+ - reftable: add error related functionality
218
+ - reftable: add LICENSE
219
+ - init-db: set the_repository->hash_algo early on
220
+ - hash.h: provide constants for the hash IDs
221
+ - refs/debug: trace into reflog expiry too
222
+ - refs: document reflog_expire_fn's flag argument
223
+ - refs: make explicit that ref_iterator_peel returns boolean
224
+
225
+ The "reftable" backend for the refs API.
226
+
227
+ Waiting for reviews.
228
+ Seems to break tests when merged to 'seen'.
229
+
230
+
231
+* ma/t0091-bugreport-fix (2021-04-12) 1 commit
232
+ - t0091-bugreport.sh: actually verify some content of report
233
+
234
+ Test fix.
235
+
236
+ Expecting a reroll.
237
+ cf. <YHYZTLl90rkWWVOr@google.com>, <87a6q22dei.fsf@evledraar.gmail.com>
238
+
239
+
240
+* ls/fast-export-signed (2021-05-03) 5 commits
241
+ - fast-export, fast-import: add support for signed-commits
242
+ - fast-export: do not modify memory from get_commit_buffer
243
+ - git-fast-export.txt: clarify why 'verbatim' may not be a good idea
244
+ - fast-export: rename --signed-tags='warn' to 'warn-verbatim'
245
+ - git-fast-import.txt: add missing LF in the BNF
246
+
247
+ "git fast-export" offers a way to control how signed tags are
248
+ handled; the mechanism has been extended to allow specifying how
249
+ signed commits are handled as well.
250
+
251
+ Expecting a reroll.
252
+ cf. <xmqqa6pca0pv.fsf@gitster.g>, <xmqq1rao9zev.fsf@gitster.g>
253
+
254
+
255
+* hn/prep-tests-for-reftable (2021-04-28) 21 commits
256
+ - t1415: set REFFILES for test specific to storage format
257
+ - t4202: mark bogus head hash test with REFFILES
258
+ - t7003: check reflog existence only for REFFILES
259
+ - t7900: mark pack-refs tests as REFFILES
260
+ - t1404: mark tests that muck with .git directly as REFFILES.
261
+ - t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
262
+ - t1414: mark corruption test with REFFILES
263
+ - t1407: require REFFILES for for_each_reflog test
264
+ - test-lib: provide test prereq REFFILES
265
+ - t5304: use "reflog expire --all" to clear the reflog
266
+ - t5304: restyle: trim empty lines, drop ':' before >
267
+ - t7003: use rev-parse rather than FS inspection
268
+ - t5000: inspect HEAD using git-rev-parse
269
+ - t5000: reformat indentation to the latest fashion
270
+ - t1301: fix typo in error message
271
+ - t1413: use tar to save and restore entire .git directory
272
+ - t1401-symbolic-ref: avoid direct filesystem access
273
+ - t5601: read HEAD using rev-parse
274
+ - t9300: check ref existence using test-helper rather than a file system check
275
+ - t/helper/ref-store: initialize oid in resolve-ref
276
+ - t4202: split testcase for invalid HEAD symref and HEAD hash
277
+
278
+ Preliminary clean-up of tests before the main reftable changes
279
+ hits the codebase.
280
+
281
+ Waiting for reviews.
282
+
283
+
284
+* tb/multi-pack-bitmaps (2021-04-10) 23 commits
285
+ - p5326: perf tests for MIDX bitmaps
286
+ - p5310: extract full and partial bitmap tests
287
+ - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
288
+ - t7700: update to work with MIDX bitmap test knob
289
+ - t5319: don't write MIDX bitmaps in t5319
290
+ - t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
291
+ - t5326: test multi-pack bitmap behavior
292
+ - t/helper/test-read-midx.c: add --checksum mode
293
+ - t5310: move some tests to lib-bitmap.sh
294
+ - pack-bitmap: write multi-pack bitmaps
295
+ - pack-bitmap: read multi-pack bitmaps
296
+ - pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
297
+ - pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
298
+ - pack-bitmap.c: introduce 'bitmap_num_objects()'
299
+ - midx: respect 'core.multiPackIndex' when writing
300
+ - midx: clear auxiliary .rev after replacing the MIDX
301
+ - midx: make a number of functions non-static
302
+ - Documentation: describe MIDX-based bitmaps
303
+ - Documentation: build 'technical/bitmap-format' by default
304
+ - pack-bitmap-write.c: free existing bitmaps
305
+ - pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
306
+ - pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps
307
+ - Merge branch 'tb/pack-preferred-tips-to-give-bitmap' into tb/multi-pack-bitmaps
308
+
309
+ The reachability bitmap file used to be generated only for a single
310
+ pack, but now we've learned to generate bitmaps for history that
311
+ span across multiple packfiles.
312
+
313
+ Waiting for reviews.
314
+ cf. <cover.1617991824.git.me@ttaylorr.com>
315
+ Seems to break tests when merged to 'seen'.
316
+
317
+
318
+* hn/refs-errno-cleanup (2021-04-30) 8 commits
319
+ - refs: explicitly propagate errno from refs_read_raw_ref
320
+ - refs: stop setting EINVAL and ELOOP in symref resolution
321
+ - refs: clear errno return in refs_resolve_ref_unsafe()
322
+ - refs: add failure_errno to refs_read_raw_ref() signature
323
+ - refs: make errno output explicit for refs_resolve_ref_unsafe
324
+ - refs: make errno output explicit for read_raw_ref_fn
325
+ - refs/files-backend: stop setting errno from lock_ref_oid_basic
326
+ - refs: remove EINVAL specification from the errno sideband in read_raw_ref_fn
327
+
328
+ Futz with the way 'errno' is relied on in the refs API to carry the
329
+ failure modes up the callchain.
330
+
331
+ Waiting for reviews.
332
+
333
+
334
+* ao/p4-avoid-decoding (2021-04-12) 2 commits
335
+ - git-p4: do not decode data from perforce by default
336
+ - git-p4: avoid decoding more data from perforce
337
+
338
+ "git p4" in Python-2 days used to accept a lot more kinds of data
339
+ from Perforce server as uninterrupted byte sequence, but after
340
+ switching to Python-3, too many things are expected to be in UTF-8,
341
+ which broke traditional use cases.
342
+
343
+ Waiting for reviews.
344
+
345
+
346
+* ab/update-submitting-patches (2021-05-13) 3 commits
347
+ - SubmittingPatches: remove pine-specific hints from MUA hints
348
+ - SubmittingPatches: replace discussion of Travis with GitHub Actions
349
+ - SubmittingPatches: move discussion of Signed-off-by above "send"
350
+
351
+ Reorganize and update the SubmitingPatches document.
352
+
353
+ Expecting a reroll.
354
+ cf. <xmqq4kf7fueq.fsf@gitster.g>, <20210512235136.GB10785@localhost>
355
+
356
+
357
* ag/merge-strategies-in-c (2021-03-17) 15 commits
358
- sequencer: use the "octopus" merge strategy without forking
359
- sequencer: use the "resolve" strategy without forking
@@ -138,36 +405,6 @@ Release tarballs are available at:
405
without hydrating it fully.
406
407
141
-* jh/rfc-builtin-fsmonitor (2021-05-04) 24 commits
142
- - fsmonitor: only enable it in non-bare repositories
143
- - t7527: test status with untracked-cache and fsmonitor--daemon
144
- - p7519: add fsmonitor--daemon
145
- - t7527: create test for fsmonitor--daemon
146
- - fsmonitor: force update index when fsmonitor token advances
147
- - fsmonitor--daemon: use a cookie file to sync with file system
148
- - fsmonitor--daemon:: introduce client delay for testing
149
- - fsmonitor--daemon: periodically truncate list of modified files
150
- - fsmonitor--daemon: implement handle_client callback
151
- - fsmonitor-fs-listen-macos: implement FSEvent listener on MacOS
152
- - fsmonitor-fs-listen-macos: add macos header files for FSEvent
153
- - fsmonitor-fs-listen-win32: implement FSMonitor backend on Windows
154
- - fsmonitor--daemon: create token-based changed path cache
155
- - fsmonitor--daemon: define token-ids
156
- - fsmonitor--daemon: add pathname classification
157
- - fsmonitor--daemon: implement daemon command options
158
- - fsmonitor-fs-listen-macos: stub in backend for MacOS
159
- - fsmonitor-fs-listen-win32: stub in backend for Windows
160
- - fsmonitor--daemon: implement client command options
161
- - fsmonitor--daemon: add a built-in fsmonitor daemon
162
- - fsmonitor: introduce `core.useBuiltinFSMonitor` to call the daemon via IPC
163
- - config: FSMonitor is repository-specific
164
- - fsmonitor-ipc: create client routines for git-fsmonitor--daemon
165
- - Merge branch 'jh/simple-ipc' into jh/rfc-builtin-fsmonitor
166
-
167
- An attempt to write and ship with a watchman equivalent tailored
168
- for our use.
169
-
170
-
408
* ab/describe-tests-fix (2021-05-11) 5 commits
409
- describe tests: support -C in "check_describe"
410
- describe tests: fix nested "test_expect_success" call
@@ -211,61 +448,71 @@ Release tarballs are available at:
448
449
Waiting for the base topic to solidify.
450
214
-
215
-* es/config-hooks (2021-03-10) 36 commits
216
- . run-command: stop thinking about hooks
217
- . git-send-email: use 'git hook run' for 'sendemail-validate'
218
- . bugreport: use hook_exists instead of find_hook
219
- . receive-pack: convert receive hooks to hook.h
220
- . post-update: use hook.h library
221
- . proc-receive: acquire hook list from hook.h
222
- . receive-pack: convert 'update' hook to hook.h
223
- . reference-transaction: look for hooks in config
224
- . transport: convert pre-push hook to use config
225
- . hook: convert 'post-rewrite' hook to config
226
- . hooks: convert 'post-checkout' hook to hook library
227
- . git-p4: use 'git hook' to run hooks
228
- . receive-pack: convert push-to-checkout hook to hook.h
229
- . read-cache: convert post-index-change hook to use config
230
- . rebase: teach pre-rebase to use hook.h
231
- . gc: use hook library for pre-auto-gc hook
232
- . merge: use config-based hooks for post-merge hook
233
- . am: convert applypatch hooks to use config
234
- . commit: use config-based hooks
235
- . hooks: allow callers to capture output
236
- . run-command: allow capturing of collated output
237
- . hook: provide stdin by string_list or callback
238
- . run-command: add stdin callback for parallelization
239
- . hook: allow specifying working directory for hooks
240
- . hook: allow parallel hook execution
241
- . run-command: allow stdin for run_processes_parallel
242
- . hook: support passing stdin to hooks
243
- . hook: introduce hook_exists()
244
- . hook: add 'run' subcommand
245
- . parse-options: parse into strvec
246
- . hook: implement hookcmd.<name>.skip
247
- . hook: teach hook.runHookDir
248
- . hook: include hookdir hook in list
249
- . hook: add list command
250
- . hook: scaffolding for git-hook subcommand
251
- . doc: propose hooks managed by the config
252
-
253
- The "hooks defined in config" topic.
254
-
451
--------------------------------------------------
452
[Cooking]
453
454
+* jh/builtin-fsmonitor (2021-05-24) 30 commits
455
+ - t/perf: avoid copying builtin fsmonitor files into test repo
456
+ - t7527: test status with untracked-cache and fsmonitor--daemon
457
+ - p7519: add fsmonitor--daemon
458
+ - t7527: create test for fsmonitor--daemon
459
+ - fsmonitor: force update index after large responses
460
+ - fsmonitor: enhance existing comments
461
+ - fsmonitor--daemon: use a cookie file to sync with file system
462
+ - fsmonitor--daemon: periodically truncate list of modified files
463
+ - fsmonitor--daemon: implement handle_client callback
464
+ - fsmonitor-fs-listen-macos: implement FSEvent listener on MacOS
465
+ - fsmonitor-fs-listen-macos: add macos header files for FSEvent
466
+ - fsmonitor-fs-listen-win32: implement FSMonitor backend on Windows
467
+ - fsmonitor--daemon: create token-based changed path cache
468
+ - fsmonitor--daemon: define token-ids
469
+ - fsmonitor--daemon: add pathname classification
470
+ - fsmonitor--daemon: implement daemon command options
471
+ - fsmonitor-fs-listen-macos: stub in backend for MacOS
472
+ - fsmonitor-fs-listen-win32: stub in backend for Windows
473
+ - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
474
+ - fsmonitor--daemon: implement client command options
475
+ - fsmonitor--daemon: add a built-in fsmonitor daemon
476
+ - fsmonitor: introduce `core.useBuiltinFSMonitor` to call the daemon via IPC
477
+ - config: FSMonitor is repository-specific
478
+ - help: include fsmonitor--daemon feature flag in version info
479
+ - fsmonitor-ipc: create client routines for git-fsmonitor--daemon
480
+ - fsmonitor--daemon: update fsmonitor documentation
481
+ - fsmonitor--daemon: man page
482
+ - simple-ipc: preparations for supporting binary messages.
483
+ - Merge branch 'jk/perf-in-worktrees' into HEAD
484
+ - Merge branch 'jh/simple-ipc' into jh/rfc-builtin-fsmonitor
485
+
486
+ An attempt to write and ship with a watchman equivalent tailored
487
+ for our use.
488
+
489
+
490
+* dd/honor-users-tar-in-tests (2021-05-22) 1 commit
491
+ (merged to 'next' on 2021-05-28 at 56961581ce)
492
+ + t: use configured TAR instead of tar
493
+
494
+ Test portability fix.
495
+
496
+ Will cook in 'next'.
497
+
498
+
499
* ah/fetch-reject-warning-grammofix (2021-05-20) 1 commit
259
- - fetch: improve grammar of "shallow roots" message
500
+ (merged to 'next' on 2021-05-28 at 09820da41b)
501
+ + fetch: improve grammar of "shallow roots" message
502
503
Message update.
504
505
+ Will cook in 'next'.
506
+
507
508
* ah/setup-extensions-message-i18n-fix (2021-05-20) 1 commit
265
- - setup: split "extensions found" messages into singular and plural
509
+ (merged to 'next' on 2021-05-28 at 562b4e6f10)
510
+ + setup: split "extensions found" messages into singular and plural
511
512
Message update.
513
514
+ Will cook in 'next'.
515
+
516
517
* jk/clone-clean-upon-transport-error (2021-05-19) 1 commit
518
(merged to 'next' on 2021-05-22 at 464b1f187c)
@@ -278,22 +525,24 @@ Release tarballs are available at:
525
526
527
* jk/doc-color-pager (2021-05-20) 1 commit
281
- - doc: explain the use of color.pager
528
+ (merged to 'next' on 2021-05-28 at 52e4aa77df)
529
+ + doc: explain the use of color.pager
530
531
The documentation for "color.pager" configuration variable has been
532
updated.
533
286
- Will merge to 'next'.
534
+ Will cook in 'next'.
535
536
537
* jk/fetch-pack-v2-half-close-early (2021-05-20) 1 commit
290
- - fetch-pack: signal v2 server that we are done making requests
538
+ (merged to 'next' on 2021-05-28 at 56e97ec2df)
539
+ + fetch-pack: signal v2 server that we are done making requests
540
541
"git fetch" over protocol v2 left its side of the socket open after
542
it finished speaking, which unnecessarily wasted the resource on
543
the other side.
544
296
- Will merge to 'next'.
545
+ Will cook in 'next'.
546
547
548
* ry/clarify-fast-forward-in-glossary (2021-05-19) 1 commit
@@ -315,15 +564,20 @@ Release tarballs are available at:
564
Will cook in 'next'.
565
566
318
-* es/trace2-log-parent-process-name (2021-05-21) 1 commit
567
+* es/trace2-log-parent-process-name (2021-05-25) 1 commit
568
- tr2: log parent process name
569
570
571
* ps/rev-list-object-type-filter (2021-05-21) 1 commit
323
- - help: fix small typo in error message
572
+ (merged to 'next' on 2021-05-28 at f22e938f3e)
573
+ + help: fix small typo in error message
574
+
575
+ Message update.
576
+
577
+ Will cook in 'next'.
578
579
326
-* ab/send-email-optim (2021-05-21) 10 commits
580
+* ab/send-email-optim (2021-05-24) 13 commits
581
- perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()
582
- send-email: move trivial config handling to Perl
583
- perl: lazily load some common Git.pm setup code
@@ -332,23 +586,15 @@ Release tarballs are available at:
586
- send-email: use function syntax instead of barewords
587
- send-email: lazily shell out to "git var"
588
- send-email: lazily load config for a big speedup
589
+ - send-email: copy "config_regxp" into git-send-email.perl
590
- send-email: refactor sendemail.smtpencryption config parsing
591
- send-email: remove non-working support for "sendemail.smtpssl"
592
+ - send-email tests: test for boolean variables without a value
593
+ - send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true
594
595
"git send-email" optimization.
596
597
341
-* ab/update-submitting-patches (2021-05-13) 3 commits
342
- - SubmittingPatches: remove pine-specific hints from MUA hints
343
- - SubmittingPatches: replace discussion of Travis with GitHub Actions
344
- - SubmittingPatches: move discussion of Signed-off-by above "send"
345
-
346
- Reorganize and update the SubmitingPatches document.
347
-
348
- Expecting a reroll.
349
- cf. <xmqq4kf7fueq.fsf@gitster.g>, <20210512235136.GB10785@localhost>
350
-
351
-
598
* zh/ref-filter-atom-type (2021-05-14) 2 commits
599
(merged to 'next' on 2021-05-16 at 48fd717185)
600
+ ref-filter: introduce enum atom_type
@@ -362,13 +608,13 @@ Release tarballs are available at:
608
Will cook in 'next'.
609
610
365
-* tl/fix-packfile-uri-doc (2021-05-14) 1 commit
366
- - packfile-uri.txt: fix blobPackfileUri description
611
+* tl/fix-packfile-uri-doc (2021-05-25) 1 commit
612
+ (merged to 'next' on 2021-05-25 at d047277014)
613
+ + packfile-uri.txt: fix blobPackfileUri description
614
615
Doc fix.
616
370
- Will merge to 'next'?
371
- cf. <xmqq8s4c6fbg.fsf@gitster.g>
617
+ Will cook in 'next'.
618
619
620
* ga/send-email-sendmail-cmd (2021-05-17) 1 commit
@@ -431,15 +677,16 @@ Release tarballs are available at:
677
678
679
* ds/write-index-with-hashfile-api (2021-05-19) 4 commits
434
- - read-cache: delete unused hashing methods
435
- - read-cache: use hashfile instead of git_hash_ctx
436
- - csum-file.h: increase hashfile buffer size
437
- - hashfile: use write_in_full()
680
+ (merged to 'next' on 2021-05-28 at f0c51ddf7c)
681
+ + read-cache: delete unused hashing methods
682
+ + read-cache: use hashfile instead of git_hash_ctx
683
+ + csum-file.h: increase hashfile buffer size
684
+ + hashfile: use write_in_full()
685
686
Use the hashfile API in the codepath that writes the index file to
687
reduce code duplication.
688
442
- Will merge to 'next'.
689
+ Will cook in 'next'.
690
691
692
* jc/clarify-revision-range (2021-05-18) 1 commit
@@ -471,22 +718,23 @@ Release tarballs are available at:
718
719
720
* so/log-m-implies-p (2021-05-21) 10 commits
474
- - diff-merges: let "-m" imply "-p"
475
- - diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
476
- - stash list: stop passing "-m" to "git log"
477
- - git-svn: stop passing "-m" to "git rev-list"
478
- - diff-merges: move specific diff-index "-m" handling to diff-index
479
- - t4013: test "git diff-index -m"
480
- - t4013: test "git diff-tree -m"
481
- - t4013: test "git log -m --stat"
482
- - t4013: test "git log -m --raw"
483
- - t4013: test that "-m" alone has no effect in "git log"
721
+ (merged to 'next' on 2021-05-28 at 2733ec2409)
722
+ + diff-merges: let "-m" imply "-p"
723
+ + diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
724
+ + stash list: stop passing "-m" to "git log"
725
+ + git-svn: stop passing "-m" to "git rev-list"
726
+ + diff-merges: move specific diff-index "-m" handling to diff-index
727
+ + t4013: test "git diff-index -m"
728
+ + t4013: test "git diff-tree -m"
729
+ + t4013: test "git log -m --stat"
730
+ + t4013: test "git log -m --raw"
731
+ + t4013: test that "-m" alone has no effect in "git log"
732
733
The "-m" option in "git log -m" that does not specify which format,
734
if any, of diff is desired did not have any visible effect; it now
735
implies some form of diff (by default "--patch") is produced.
736
489
- Will merge to 'next'.
737
+ Will cook in 'next'.
738
739
740
* bc/doc-asciidoctor-to-man-wo-xmlto (2021-05-14) 2 commits
@@ -498,125 +746,34 @@ Release tarballs are available at:
746
747
748
* ab/trace2-squelch-gcc-warning (2021-05-21) 1 commit
501
- - trace2: refactor to avoid gcc warning under -O3
749
+ (merged to 'next' on 2021-05-28 at 6c7a015f99)
750
+ + trace2: refactor to avoid gcc warning under -O3
751
752
Workaround compiler warnings.
753
505
- Will merge to 'next'.
506
-
507
-
508
-* hn/refs-errno-cleanup (2021-04-30) 8 commits
509
- - refs: explicitly propagate errno from refs_read_raw_ref
510
- - refs: stop setting EINVAL and ELOOP in symref resolution
511
- - refs: clear errno return in refs_resolve_ref_unsafe()
512
- - refs: add failure_errno to refs_read_raw_ref() signature
513
- - refs: make errno output explicit for refs_resolve_ref_unsafe
514
- - refs: make errno output explicit for read_raw_ref_fn
515
- - refs/files-backend: stop setting errno from lock_ref_oid_basic
516
- - refs: remove EINVAL specification from the errno sideband in read_raw_ref_fn
517
-
518
- Futz with the way 'errno' is relied on in the refs API to carry the
519
- failure modes up the callchain.
520
-
521
- Waiting for reviews.
754
+ Will cook in 'next'.
755
756
757
* en/ort-perf-batch-11 (2021-05-20) 13 commits
525
- - merge-ort, diffcore-rename: employ cached renames when possible
526
- - merge-ort: handle interactions of caching and rename/rename(1to1) cases
527
- - merge-ort: add helper functions for using cached renames
528
- - merge-ort: preserve cached renames for the appropriate side
529
- - merge-ort: avoid accidental API mis-use
530
- - merge-ort: add code to check for whether cached renames can be reused
531
- - merge-ort: populate caches of rename detection results
532
- - merge-ort: add data structures for in-memory caching of rename detection
533
- - t6429: testcases for remembering renames
534
- - fast-rebase: write conflict state to working tree, index, and HEAD
535
- - fast-rebase: change assert() to BUG()
536
- - Documentation/technical: describe remembering renames optimization
537
- - t6423: rename file within directory that other side renamed
758
+ (merged to 'next' on 2021-05-28 at 58a8b85d6a)
759
+ + merge-ort, diffcore-rename: employ cached renames when possible
760
+ + merge-ort: handle interactions of caching and rename/rename(1to1) cases
761
+ + merge-ort: add helper functions for using cached renames
762
+ + merge-ort: preserve cached renames for the appropriate side
763
+ + merge-ort: avoid accidental API mis-use
764
+ + merge-ort: add code to check for whether cached renames can be reused
765
+ + merge-ort: populate caches of rename detection results
766
+ + merge-ort: add data structures for in-memory caching of rename detection
767
+ + t6429: testcases for remembering renames
768
+ + fast-rebase: write conflict state to working tree, index, and HEAD
769
+ + fast-rebase: change assert() to BUG()
770
+ + Documentation/technical: describe remembering renames optimization
771
+ + t6423: rename file within directory that other side renamed
772
773
Optimize out repeated rename detection in a sequence of mergy
774
operations.
775
542
- Will merge to 'next'.
543
-
544
-
545
-* ls/fast-export-signed (2021-05-03) 5 commits
546
- - fast-export, fast-import: add support for signed-commits
547
- - fast-export: do not modify memory from get_commit_buffer
548
- - git-fast-export.txt: clarify why 'verbatim' may not be a good idea
549
- - fast-export: rename --signed-tags='warn' to 'warn-verbatim'
550
- - git-fast-import.txt: add missing LF in the BNF
551
-
552
- "git fast-export" offers a way to control how signed tags are
553
- handled; the mechanism has been extended to allow specifying how
554
- signed commits are handled as well.
555
-
556
- Expecting a reroll.
557
- cf. <xmqqa6pca0pv.fsf@gitster.g>, <xmqq1rao9zev.fsf@gitster.g>
558
-
559
-
560
-* hn/prep-tests-for-reftable (2021-04-28) 21 commits
561
- - t1415: set REFFILES for test specific to storage format
562
- - t4202: mark bogus head hash test with REFFILES
563
- - t7003: check reflog existence only for REFFILES
564
- - t7900: mark pack-refs tests as REFFILES
565
- - t1404: mark tests that muck with .git directly as REFFILES.
566
- - t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
567
- - t1414: mark corruption test with REFFILES
568
- - t1407: require REFFILES for for_each_reflog test
569
- - test-lib: provide test prereq REFFILES
570
- - t5304: use "reflog expire --all" to clear the reflog
571
- - t5304: restyle: trim empty lines, drop ':' before >
572
- - t7003: use rev-parse rather than FS inspection
573
- - t5000: inspect HEAD using git-rev-parse
574
- - t5000: reformat indentation to the latest fashion
575
- - t1301: fix typo in error message
576
- - t1413: use tar to save and restore entire .git directory
577
- - t1401-symbolic-ref: avoid direct filesystem access
578
- - t5601: read HEAD using rev-parse
579
- - t9300: check ref existence using test-helper rather than a file system check
580
- - t/helper/ref-store: initialize oid in resolve-ref
581
- - t4202: split testcase for invalid HEAD symref and HEAD hash
582
-
583
- Preliminary clean-up of tests before the main reftable changes
584
- hits the codebase.
585
-
586
- Waiting for reviews.
587
-
588
-
589
-* tb/multi-pack-bitmaps (2021-04-10) 23 commits
590
- - p5326: perf tests for MIDX bitmaps
591
- - p5310: extract full and partial bitmap tests
592
- - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
593
- - t7700: update to work with MIDX bitmap test knob
594
- - t5319: don't write MIDX bitmaps in t5319
595
- - t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
596
- - t5326: test multi-pack bitmap behavior
597
- - t/helper/test-read-midx.c: add --checksum mode
598
- - t5310: move some tests to lib-bitmap.sh
599
- - pack-bitmap: write multi-pack bitmaps
600
- - pack-bitmap: read multi-pack bitmaps
601
- - pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
602
- - pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
603
- - pack-bitmap.c: introduce 'bitmap_num_objects()'
604
- - midx: respect 'core.multiPackIndex' when writing
605
- - midx: clear auxiliary .rev after replacing the MIDX
606
- - midx: make a number of functions non-static
607
- - Documentation: describe MIDX-based bitmaps
608
- - Documentation: build 'technical/bitmap-format' by default
609
- - pack-bitmap-write.c: free existing bitmaps
610
- - pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
611
- - pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps
612
- - Merge branch 'tb/pack-preferred-tips-to-give-bitmap' into tb/multi-pack-bitmaps
613
-
614
- The reachability bitmap file used to be generated only for a single
615
- pack, but now we've learned to generate bitmaps for history that
616
- span across multiple packfiles.
617
-
618
- Waiting for reviews.
619
- cf. <cover.1617991824.git.me@ttaylorr.com>
776
+ Will cook in 'next'.
777
778
779
* ab/test-lib-updates (2021-05-11) 11 commits
@@ -636,77 +793,6 @@ Release tarballs are available at:
793
Test clean-up.
794
795
639
-* ao/p4-avoid-decoding (2021-04-12) 2 commits
640
- - git-p4: do not decode data from perforce by default
641
- - git-p4: avoid decoding more data from perforce
642
-
643
- "git p4" in Python-2 days used to accept a lot more kinds of data
644
- from Perforce server as uninterrupted byte sequence, but after
645
- switching to Python-3, too many things are expected to be in UTF-8,
646
- which broke traditional use cases.
647
-
648
- Waiting for reviews.
649
-
650
-
651
-* ma/t0091-bugreport-fix (2021-04-12) 1 commit
652
- - t0091-bugreport.sh: actually verify some content of report
653
-
654
- Test fix.
655
-
656
- Expecting a reroll.
657
- cf. <YHYZTLl90rkWWVOr@google.com>, <87a6q22dei.fsf@evledraar.gmail.com>
658
-
659
-
660
-* mr/bisect-in-c-4 (2021-04-11) 4 commits
661
- - bisect--helper: retire `--bisect-next-check` subcommand
662
- - bisect--helper: reimplement `bisect_run` shell function in C
663
- - bisect--helper: reimplement `bisect_visualize()`shell function in C
664
- - run-command: make `exists_in_PATH()` non-static
665
-
666
- The codepaths involved in running "git bisect visualize" and "git
667
- bisect run" has been rewritten in C.
668
-
669
- Expecting a reroll.
670
- cf. <xmqq35vwh8qk.fsf@gitster.g>, <xmqqy2doftrj.fsf@gitster.g>,
671
- <CAP8UFD3X24F3qgefHpi00PM-KUk+vcqxwy2Dbngbyj7ciavCVQ@mail.gmail.com>
672
- May want to boost the test coverage.
673
-
674
-
675
-* hn/reftable (2021-05-20) 28 commits
676
- - t1404: annotate test cases with REFFILES
677
- - t1401,t2011: parameterize HEAD.lock for REFTABLE
678
- - t1301: document what needs to be done for REFTABLE
679
- - Add "test-tool dump-reftable" command.
680
- - git-prompt: prepare for reftable refs backend
681
- - Reftable support for git-core
682
- - reftable: add dump utility
683
- - reftable: implement stack, a mutable database of reftable files.
684
- - reftable: implement refname validation
685
- - reftable: add merged table view
686
- - reftable: add a heap-based priority queue for reftable records
687
- - reftable: reftable file level tests
688
- - reftable: read reftable files
689
- - reftable: generic interface to tables
690
- - reftable: write reftable files
691
- - reftable: a generic binary tree implementation
692
- - reftable: reading/writing blocks
693
- - Provide zlib's uncompress2 from compat/zlib-compat.c
694
- - reftable: (de)serialization for the polymorphic record type.
695
- - reftable: add blocksource, an abstraction for random access reads
696
- - reftable: utility functions
697
- - reftable: add error related functionality
698
- - reftable: add LICENSE
699
- - init-db: set the_repository->hash_algo early on
700
- - hash.h: provide constants for the hash IDs
701
- - refs/debug: trace into reflog expiry too
702
- - refs: document reflog_expire_fn's flag argument
703
- - refs: make explicit that ref_iterator_peel returns boolean
704
-
705
- The "reftable" backend for the refs API.
706
-
707
- Waiting for reviews.
708
-
709
-
796
* ab/fsck-unexpected-type (2021-05-21) 17 commits
797
- fsck: report invalid object type-path combinations
798
- fsck: report invalid types recorded in objects
@@ -728,3 +814,5 @@ Release tarballs are available at:
814
815
"git fsck" has been taught to report mismatch between expected and
816
actual types of an object better.
817
+
818
+ Seems to break tests when merged to 'seen'.