What's cooking (2021/04 #05)
Junio C Hamano committed
Apr 19, 2021 at 16:19 UTC
be30851f1db22bbb49d9f8bca174e901ab6c4382
1 file changed
+280
-307
whats-cooking.txt
+280
-307
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2021, #04; Thu, 15)
4
-X-master-at: d1b10fc6d84d49796026e567833b88c7f8886c35
5
-X-next-at: 2be84b2adec173cb8ec032d604b94d60c1637cb9
3
+Subject: What's cooking in git.git (Apr 2021, #05; Mon, 19)
4
+X-master-at: b0c09ab8796fb736efa432b8e817334f3e5ee75a
5
+X-next-at: 90b4fd31cda88325bdebf89b7d407491b176f853
6
7
-What's cooking in git.git (Apr 2021, #04; Thu, 15)
7
+What's cooking in git.git (Apr 2021, #05; Mon, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -43,214 +43,117 @@ Release tarballs are available at:
43
--------------------------------------------------
44
[Graduated to 'master']
45
46
-* ab/complete-cherry-pick-head (2021-04-07) 1 commit
47
- (merged to 'next' on 2021-04-09 at 5810d0e2c2)
48
- + bash completion: complete CHERRY_PICK_HEAD
49
-
50
- The command line completion (in contrib/) has learned that
51
- CHERRY_PICK_HEAD is a possible pseudo-ref.
52
-
53
-
54
-* ab/detox-config-gettext (2021-04-08) 1 commit
55
- (merged to 'next' on 2021-04-08 at 01d6ff5069)
56
- + config.c: remove last remnant of GIT_TEST_GETTEXT_POISON
57
-
58
- The last remnant of gettext-poison has been removed.
59
-
60
-
61
-* ab/perl-do-not-abuse-map (2021-04-02) 1 commit
62
- (merged to 'next' on 2021-04-03 at 4eaf558557)
63
- + git-send-email: replace "map" in void context with "for"
64
- (this branch is used by ab/send-email-validate-errors.)
65
-
66
- Perl critique.
67
-
68
-
69
-* ab/send-email-validate-errors (2021-04-06) 3 commits
70
- (merged to 'next' on 2021-04-06 at d7fb1dbde0)
71
- + git-send-email: improve --validate error output
72
- + git-send-email: refactor duplicate $? checks into a function
73
- + git-send-email: test full --validate output
74
- (this branch uses ab/perl-do-not-abuse-map.)
75
-
76
- Clean-up codepaths that implements "git send-email --validate"
77
- option and improves the message from it.
78
-
79
-
80
-* cc/test-helper-bloom-usage-fix (2021-04-05) 1 commit
81
- (merged to 'next' on 2021-04-06 at 4895f33fee)
82
- + test-bloom: fix missing 'bloom' from usage string
83
-
84
- Usage message fix for a test helper.
85
-
86
-
87
-* fm/user-manual-use-preface (2021-04-03) 1 commit
88
- (merged to 'next' on 2021-04-05 at 0ae8f63207)
89
- + user-manual.txt: assign preface an id and a title
90
-
91
- Doc update to improve git.info
92
-
93
-
94
-* gk/gitweb-redacted-email (2021-04-08) 1 commit
95
- (merged to 'next' on 2021-04-08 at 8a19c3cd6e)
96
- + gitweb: add "e-mail privacy" feature to redact e-mail addresses
97
-
98
- "gitweb" learned "e-mail privacy" feature to redact strings that
99
- look like e-mail addresses on various pages.
100
-
101
-
102
-* jk/ref-filter-segfault-fix (2021-04-01) 1 commit
103
- (merged to 'next' on 2021-04-02 at 03596563b7)
104
- + ref-filter: fix NULL check for parse object failure
105
-
106
- A NULL-dereference bug has been corrected in an error codepath in
107
- "git for-each-ref", "git branch --list" etc.
108
-
109
-
110
-* jz/apply-3way-cached (2021-04-07) 1 commit
111
- (merged to 'next' on 2021-04-09 at 7d1e84936f)
112
- + git-apply: allow simultaneous --cached and --3way options
113
- (this branch uses jz/apply-run-3way-first.)
114
-
115
- "git apply" now takes "--3way" and "--cached" at the same time, and
116
- work and record results only in the index.
117
-
118
-
119
-* jz/apply-run-3way-first (2021-04-06) 1 commit
120
- (merged to 'next' on 2021-04-08 at f826bcc6b8)
121
- + git-apply: try threeway first when "--3way" is used
122
- (this branch is used by jz/apply-3way-cached.)
123
-
124
- "git apply --3way" has always been "to fall back to 3-way merge
125
- only when straight application fails". Swap the order of falling
126
- back so that 3-way is always attempted first (only when the option
127
- is given, of course) and then straight patch application is used as
128
- a fallback when it fails.
129
-
130
-
131
-* tb/pack-preferred-tips-to-give-bitmap (2021-03-31) 3 commits
132
- (merged to 'next' on 2021-04-03 at cd7024ecd8)
133
- + builtin/pack-objects.c: respect 'pack.preferBitmapTips'
134
- + t/helper/test-bitmap.c: initial commit
135
- + pack-bitmap: add 'test_bitmap_commits()' helper
136
- (this branch is used by tb/multi-pack-bitmaps.)
46
+* ah/merge-ort-ubsan-fix (2021-04-12) 1 commit
47
+ (merged to 'next' on 2021-04-13 at 41713a32bd)
48
+ + merge-ort: only do pointer arithmetic for non-empty lists
49
138
- A configuration variable has been added to force tips of certain
139
- refs to be given a reachability bitmap.
50
+ Code clean-up for merge-ort backend.
51
52
142
-* tb/precompose-prefix-simplify (2021-04-05) 2 commits
143
- (merged to 'next' on 2021-04-05 at 78e8ed11b7)
144
- + macOS: precompose startup_info->prefix
145
- + precompose_utf8: make precompose_string_if_needed() public
53
+* en/ort-perf-batch-10 (2021-03-18) 8 commits
54
+ (merged to 'next' on 2021-04-07 at 9826d89311)
55
+ + diffcore-rename: determine which relevant_sources are no longer relevant
56
+ + merge-ort: record the reason that we want a rename for a file
57
+ + diffcore-rename: add computation of number of unknown renames
58
+ + diffcore-rename: check if we have enough renames for directories early on
59
+ + diffcore-rename: only compute dir_rename_count for relevant directories
60
+ + merge-ort: record the reason that we want a rename for a directory
61
+ + merge-ort, diffcore-rename: tweak dirs_removed and relevant_source type
62
+ + diffcore-rename: take advantage of "majority rules" to skip more renames
63
+ (this branch is used by en/ort-perf-batch-11 and en/ort-readiness.)
64
147
- Streamline the codepath to fix the UTF-8 encoding issues in the
148
- argv[] and the prefix on macOS.
65
+ Various rename detection optimization to help "ort" merge strategy
66
+ backend.
67
68
151
-* vs/completion-with-set-u (2021-04-08) 1 commit
152
- (merged to 'next' on 2021-04-08 at b9b8bde89d)
153
- + completion: audit and guard $GIT_* against unset use
69
+* en/ort-readiness (2021-03-20) 13 commits
70
+ (merged to 'next' on 2021-04-08 at 20283a3f10)
71
+ + Add testing with merge-ort merge strategy
72
+ + t6423: mark remaining expected failure under merge-ort as such
73
+ + Revert "merge-ort: ignore the directory rename split conflict for now"
74
+ + merge-recursive: add a bunch of FIXME comments documenting known bugs
75
+ + merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
76
+ + t: mark several submodule merging tests as fixed under merge-ort
77
+ + merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
78
+ + t6428: new test for SKIP_WORKTREE handling and conflicts
79
+ + merge-ort: support subtree shifting
80
+ + merge-ort: let renormalization change modify/delete into clean delete
81
+ + merge-ort: have ll_merge() use a special attr_index for renormalization
82
+ + merge-ort: add a special minimal index just for renormalization
83
+ + merge-ort: use STABLE_QSORT instead of QSORT where required
84
+ (this branch is used by en/ort-perf-batch-11; uses en/ort-perf-batch-10.)
85
155
- The command-line completion script (in contrib/) had a couple of
156
- references that would have given a warning under the "-u" (nounset)
157
- option.
86
+ Plug the ort merge backend throughout the rest of the system, and
87
+ start testing it as a replacement for the recursive backend.
88
89
--------------------------------------------------
90
[New Topics]
91
162
-* ab/detox-gettext-tests (2021-04-13) 1 commit
163
- (merged to 'next' on 2021-04-15 at db0da2903a)
164
- + tests: remove all uses of test_i18cmp
165
-
166
- Test clean-up.
167
-
168
- Will merge to 'master'.
92
+* ba/object-info (2021-04-15) 2 commits
93
+ - SQUASH???
94
+ - object-info: support for retrieving object info
95
96
+ Over-the-wire protocol learns a new request type to ask for object
97
+ sizes given a list of object names.
98
171
-* ab/fsck-unexpected-type (2021-04-13) 6 commits
172
- - fsck: report invalid object type-path combinations
173
- - fsck: report invalid types recorded in objects
174
- - object-store.h: move read_loose_object() below 'struct object_info'
175
- - fsck: don't hard die on invalid object types
176
- - fsck tests: refactor one test to use a sub-repo
177
- - cache.h: move object functions to object-store.h
178
-
179
- "git fsck" has been taught to report mismatch between expected and
180
- actual types of an object better.
99
100
+* js/access-nul-emulation-on-windows (2021-04-16) 1 commit
101
+ (merged to 'next' on 2021-04-16 at 3017437e51)
102
+ + msvc: avoid calling `access("NUL", flags)`
103
183
-* ab/usage-error-docs (2021-04-13) 3 commits
184
- (merged to 'next' on 2021-04-15 at dbbbaa5eea)
185
- + api docs: document that BUG() emits a trace2 error event
186
- + api docs: document BUG() in api-error-handling.txt
187
- + usage.c: don't copy/paste the same comment three times
188
-
189
- Documentation updates, with unrelated comment updates, too.
104
+ Portability fix.
105
106
Will merge to 'master'.
107
108
194
-* jk/promisor-optim (2021-04-13) 3 commits
195
- (merged to 'next' on 2021-04-15 at 41f303ef9b)
196
- + revision: avoid parsing with --exclude-promisor-objects
197
- + lookup_unknown_object(): take a repository argument
198
- + is_promisor_object(): free tree buffer after parsing
199
- (this branch is used by rs/repack-without-loosening-promised-objects.)
200
-
201
- Handling of "promisor packs" that allows certain objects to be
202
- missing and lazily retrievable has been optimized (a bit).
203
-
204
- Will merge to 'master'.
109
+* zh/format-ref-array-optim (2021-04-19) 2 commits
110
+ - ref-filter: reuse output buffer
111
+ - ref-filter: get rid of show_ref_array_item
112
113
+ "git (branch|tag) --format=..." has been micro-optimized.
114
207
-* so/log-diff-merge (2021-04-13) 5 commits
208
- - doc/diff-options: document new --diff-merges features
209
- - diff-merges: introduce log.diffMerges config variable
210
- - diff-merges: adapt -m to enable default diff format
211
- - diff-merges: refactor set_diff_merges()
212
- - diff-merges: introduce --diff-merges=on
115
+ Almost there?
116
214
- "git log" learned "--diff-merges=<style>" option, with an
215
- associated configuration variable log.diffMerges.
117
217
- Seems to break t9902.
118
+* vs/completion-with-set-u (2021-04-16) 1 commit
119
+ - completion: avoid aliased command lookup error in nounset mode
120
219
-
220
-* rs/repack-without-loosening-promised-objects (2021-04-14) 2 commits
221
- - repack: avoid loosening promisor pack objects in partial clones
222
- - repack: teach --no-prune-packed to skip `git prune-packed`
223
- (this branch uses jk/promisor-optim.)
224
-
225
- "git repack -A -d" in a partial clone unnecessarily loosened
226
- objects in promisor pack.
227
-
228
-
229
-* jc/doc-do-not-capitalize-clarification (2021-04-14) 1 commit
230
- (merged to 'next' on 2021-04-15 at 873f7a1f84)
231
- + doc: clarify "do not capitalize the first word" rule
232
-
233
- Doc update for developers.
234
-
235
- Will merge to 'master'.
236
-
237
-
238
-* mt/pkt-write-errors (2021-04-15) 1 commit
239
- - pkt-line: do not report packet write errors twice
240
-
241
- When packet_write() fails, we gave an extra error message
242
- unnecessarily, which has been corrected.
121
+ Effort to make the command line completion (in contrib/) safe with
122
+ "set -u" continues.
123
124
Will merge to 'next'.
125
126
247
-* ow/push-quiet-set-upstream (2021-04-15) 1 commit
248
- - transport: respect verbosity when setting upstream
249
-
250
- "git push --quiet --set-upstream" was not quiet when setting the
251
- upstream branch configuration, which has been corrected.
252
-
253
- Will merge to 'next'.
127
+* hn/prep-tests-for-reftable (2021-04-19) 18 commits
128
+ - t1415: set REFFILES for test specific to storage format
129
+ - t4202: mark bogus head hash test with REFFILES
130
+ - t7003: check reflog existence only for REFFILES
131
+ - t7900: mark pack-refs tests as REFFILES
132
+ - t1404: mark tests that muck with .git directly as REFFILES.
133
+ - t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
134
+ - t1414: mark corruption test with REFFILES
135
+ - t1407: require REFFILES for for_each_reflog test
136
+ - test-lib: provide test prereq REFFILES
137
+ - t5304: use "reflog expire --all" to clear the reflog
138
+ - t7003: use rev-parse rather than FS inspection
139
+ - t5000: inspect HEAD using git-rev-parse
140
+ - t1301: fix typo in error message
141
+ - t1413: use tar to save and restore entire .git directory
142
+ - t1401-symbolic-ref: avoid direct filesystem access
143
+ - t5601: read HEAD using rev-parse
144
+ - t9300: check ref existence using git-rev-parse rather than FS check
145
+ - t4202: split testcase for invalid HEAD symref and HEAD hash
146
+
147
+ Preliminary clean-up of tests before the main reftable changes
148
+ hits the codebase.
149
+
150
+
151
+* ps/config-env-option-with-separate-value (2021-04-19) 2 commits
152
+ - git: support separate arg for `--config-env`'s value
153
+ - git.txt: fix synopsis of `--config-env` missing the equals sign
154
+
155
+ "git --config-env var=val cmd" weren't accepted (only
156
+ --config-env=var=val was).
157
158
--------------------------------------------------
159
[Stalled]
@@ -390,6 +293,107 @@ Release tarballs are available at:
293
--------------------------------------------------
294
[Cooking]
295
296
+* ab/detox-gettext-tests (2021-04-13) 1 commit
297
+ (merged to 'next' on 2021-04-15 at db0da2903a)
298
+ + tests: remove all uses of test_i18cmp
299
+
300
+ Test clean-up.
301
+
302
+ Will merge to 'master'.
303
+
304
+
305
+* ab/fsck-unexpected-type (2021-04-13) 6 commits
306
+ - fsck: report invalid object type-path combinations
307
+ - fsck: report invalid types recorded in objects
308
+ - object-store.h: move read_loose_object() below 'struct object_info'
309
+ - fsck: don't hard die on invalid object types
310
+ - fsck tests: refactor one test to use a sub-repo
311
+ - cache.h: move object functions to object-store.h
312
+
313
+ "git fsck" has been taught to report mismatch between expected and
314
+ actual types of an object better.
315
+
316
+
317
+* ab/usage-error-docs (2021-04-13) 3 commits
318
+ (merged to 'next' on 2021-04-15 at dbbbaa5eea)
319
+ + api docs: document that BUG() emits a trace2 error event
320
+ + api docs: document BUG() in api-error-handling.txt
321
+ + usage.c: don't copy/paste the same comment three times
322
+
323
+ Documentation updates, with unrelated comment updates, too.
324
+
325
+ Will merge to 'master'.
326
+
327
+
328
+* jk/promisor-optim (2021-04-13) 3 commits
329
+ (merged to 'next' on 2021-04-15 at 41f303ef9b)
330
+ + revision: avoid parsing with --exclude-promisor-objects
331
+ + lookup_unknown_object(): take a repository argument
332
+ + is_promisor_object(): free tree buffer after parsing
333
+ (this branch is used by rs/repack-without-loosening-promised-objects.)
334
+
335
+ Handling of "promisor packs" that allows certain objects to be
336
+ missing and lazily retrievable has been optimized (a bit).
337
+
338
+ Will merge to 'master'.
339
+
340
+
341
+* so/log-diff-merge (2021-04-16) 5 commits
342
+ (merged to 'next' on 2021-04-17 at 6c1eba8ee3)
343
+ + doc/diff-options: document new --diff-merges features
344
+ + diff-merges: introduce log.diffMerges config variable
345
+ + diff-merges: adapt -m to enable default diff format
346
+ + diff-merges: refactor set_diff_merges()
347
+ + diff-merges: introduce --diff-merges=on
348
+ (this branch uses sg/bugreport-fixes.)
349
+
350
+ "git log" learned "--diff-merges=<style>" option, with an
351
+ associated configuration variable log.diffMerges.
352
+
353
+ Will merge to 'master'.
354
+
355
+
356
+* rs/repack-without-loosening-promised-objects (2021-04-19) 1 commit
357
+ - repack: avoid loosening promisor objects in partial clones
358
+ (this branch uses jk/promisor-optim.)
359
+
360
+ "git repack -A -d" in a partial clone unnecessarily loosened
361
+ objects in promisor pack.
362
+
363
+ Almost there.
364
+ cf. <20210419191553.581877-1-jonathantanmy@google.com>
365
+ cf. <xmqqa6pt98j4.fsf@gitster.g>
366
+
367
+
368
+* jc/doc-do-not-capitalize-clarification (2021-04-14) 1 commit
369
+ (merged to 'next' on 2021-04-15 at 873f7a1f84)
370
+ + doc: clarify "do not capitalize the first word" rule
371
+
372
+ Doc update for developers.
373
+
374
+ Will merge to 'master'.
375
+
376
+
377
+* mt/pkt-write-errors (2021-04-15) 1 commit
378
+ (merged to 'next' on 2021-04-16 at 4a82d89ff3)
379
+ + pkt-line: do not report packet write errors twice
380
+
381
+ When packet_write() fails, we gave an extra error message
382
+ unnecessarily, which has been corrected.
383
+
384
+ Will merge to 'master'.
385
+
386
+
387
+* ow/push-quiet-set-upstream (2021-04-15) 1 commit
388
+ (merged to 'next' on 2021-04-16 at 9466d4ef38)
389
+ + transport: respect verbosity when setting upstream
390
+
391
+ "git push --quiet --set-upstream" was not quiet when setting the
392
+ upstream branch configuration, which has been corrected.
393
+
394
+ Will merge to 'master'.
395
+
396
+
397
* jt/fetch-pack-request-fix (2021-04-08) 1 commit
398
(merged to 'next' on 2021-04-15 at 25c02ce3c3)
399
+ fetch-pack: buffer object-format with other args
@@ -455,7 +459,8 @@ Release tarballs are available at:
459
looked (at least to me) to be obviously correct.
460
461
458
-* bc/hash-transition-interop-part-1 (2021-04-10) 16 commits
462
+* bc/hash-transition-interop-part-1 (2021-04-19) 17 commits
463
+ - http-push: set algorithm when reading object ID
464
- fixup! hash: provide per-algorithm null OIDs
465
- hex: print objects using the hash algorithm member
466
- hex: default to the_hash_algo on zero algorithm value
@@ -475,10 +480,11 @@ Release tarballs are available at:
480
481
SHA-256 transition.
482
478
- Seems to break the tests when merged to 'seen'.
483
+ Expecting a reroll.
484
+ cf. <YHzmjhLy2QjDefXy@camp.crustytoothpaste.net>
485
486
481
-* ps/rev-list-object-type-filter (2021-04-12) 8 commits
487
+* ps/rev-list-object-type-filter (2021-04-19) 8 commits
488
- rev-list: allow filtering of provided items
489
- pack-bitmap: implement combined filter
490
- pack-bitmap: implement object type filter
@@ -492,7 +498,8 @@ Release tarballs are available at:
498
which can be used to exclude objects of the given kind from the
499
packfile generated by pack-objects.
500
495
- Seems to break the tests when merged to 'seen'.
501
+ Will merge to 'next'?
502
+ cf. <cover.1618832437.git.ps@pks.im>
503
504
505
* tb/multi-pack-bitmaps (2021-04-10) 23 commits
@@ -535,6 +542,7 @@ Release tarballs are available at:
542
Test clean-up.
543
544
Waiting for reviews.
545
+ cf. <87mttx121j.fsf@evledraar.gmail.com>
546
547
548
* ab/test-lib-updates (2021-04-12) 16 commits
@@ -558,16 +566,7 @@ Release tarballs are available at:
566
567
Test clean-up.
568
561
- Waiting for reviews.
562
-
563
-
564
-* ah/merge-ort-ubsan-fix (2021-04-12) 1 commit
565
- (merged to 'next' on 2021-04-13 at 41713a32bd)
566
- + merge-ort: only do pointer arithmetic for non-empty lists
567
-
568
- Code clean-up for merge-ort backend.
569
-
570
- Will merge to 'master'.
569
+ Waiting for review discussion to conclude.
570
571
572
* ao/p4-avoid-decoding (2021-04-12) 2 commits
@@ -621,11 +620,10 @@ Release tarballs are available at:
620
cf. <YHYZTLl90rkWWVOr@google.com>, <87a6q22dei.fsf@evledraar.gmail.com>
621
622
624
-* ps/config-global-override (2021-04-13) 3 commits
625
- (merged to 'next' on 2021-04-15 at 60a58d74ab)
626
- + config: allow overriding of global and system configuration
627
- + config: unify code paths to get global config paths
628
- + config: rename `git_etc_config()`
623
+* ps/config-global-override (2021-04-19) 3 commits
624
+ - config: allow overriding of global and system configuration
625
+ - config: unify code paths to get global config paths
626
+ - config: rename `git_etc_config()`
627
628
Replace GIT_CONFIG_NOSYSTEM mechanism to decline from reading the
629
system-wide configuration file with GIT_CONFIG_SYSTEM that lets
@@ -634,21 +632,23 @@ Release tarballs are available at:
632
setting NOSYSTEM), and introduce GIT_CONFIG_GLOBAL to override the
633
per-user configuration in $HOME/.gitconfig.
634
637
- Will merge to 'master'.
635
+ Will merge to 'next'?
636
+ Reverted from 'next' to fix GIT_CONFIG_NOSYSTEM regression.
637
638
640
-* ds/maintenance-prefetch-fix (2021-04-10) 3 commits
641
- - maintenance: use 'git fetch --prefetch'
642
- - fetch: add --prefetch option
643
- - maintenance: simplify prefetch logic
639
+* ds/maintenance-prefetch-fix (2021-04-16) 4 commits
640
+ (merged to 'next' on 2021-04-16 at 0a1818e235)
641
+ + maintenance: respect remote.*.skipFetchAll
642
+ + maintenance: use 'git fetch --prefetch'
643
+ + fetch: add --prefetch option
644
+ + maintenance: simplify prefetch logic
645
646
The prefetch task in "git maintenance" assumed that "git fetch"
647
from any remote would fetch all its local branches, which would
648
fetch too much if the user is interested in only a subset of
649
branches there.
650
650
- Expecting a reroll.
651
- cf. <e7f09182-3b75-f2a3-c9c7-0055cc377a32@gmail.com>
651
+ Will merge to 'master'.
652
653
654
* mr/bisect-in-c-4 (2021-04-11) 4 commits
@@ -666,14 +666,15 @@ Release tarballs are available at:
666
667
668
* sg/bugreport-fixes (2021-04-08) 1 commit
669
- - Makefile: add missing dependencies of 'config-list.h'
669
+ (merged to 'next' on 2021-04-16 at e93602f4df)
670
+ + Makefile: add missing dependencies of 'config-list.h'
671
+ (this branch is used by so/log-diff-merge.)
672
673
The dependencies for config-list.h and command-list.h were broken
674
when the former was split out of the latter, which has been
675
corrected.
676
675
- Expecting a reroll.
676
- cf. <20210409212044.GD2947267@szeder.dev>
677
+ Will merge to 'master'.
678
679
680
* mt/add-rm-in-sparse-checkout (2021-04-08) 7 commits
@@ -714,10 +715,16 @@ Release tarballs are available at:
715
- fsmonitor-ipc: create client routines for git-fsmonitor--daemon
716
- Merge branch 'jh/simple-ipc' into jh/rfc-builtin-fsmonitor
717
718
+ An attempt to write and ship with a watchman equivalent tailored
719
+ for our use.
720
+
721
+ Will discard.
722
+ ... as nobody seems to be interested.
723
718
-* zh/trailer-cmd (2021-04-12) 2 commits
724
+
725
+* zh/trailer-cmd (2021-04-17) 2 commits
726
- trailer: add new .cmd config option
720
- - docs: correct descript of trailer.<token>.command
727
+ - docs: correct description of .command
728
729
The way the command line specified by the trailer.<token>.command
730
configuration variable receives the end-user supplied value was
@@ -725,10 +732,8 @@ Release tarballs are available at:
732
same goal in a safer and more intuitive way has been added, as
733
the trailer.<token>.cmd configuration variable, to replace it.
734
728
- Waiting for reviews.
729
- I doubt it is a good idea to copy the "run once even without being
730
- asked" from .command interface.
731
- cf. <xmqqwnt7b5fg.fsf@gitster.g>
735
+ Waiting for reviews to conclude.
736
+ cf. <xmqq5z0kbl8x.fsf@gitster.g>
737
738
739
* ab/userdiff-tests (2021-04-08) 9 commits
@@ -791,115 +796,83 @@ Release tarballs are available at:
796
On hold, waiting for the "protections" topic to stablize.
797
798
794
-* en/ort-perf-batch-10 (2021-03-18) 8 commits
795
- (merged to 'next' on 2021-04-07 at 9826d89311)
796
- + diffcore-rename: determine which relevant_sources are no longer relevant
797
- + merge-ort: record the reason that we want a rename for a file
798
- + diffcore-rename: add computation of number of unknown renames
799
- + diffcore-rename: check if we have enough renames for directories early on
800
- + diffcore-rename: only compute dir_rename_count for relevant directories
801
- + merge-ort: record the reason that we want a rename for a directory
802
- + merge-ort, diffcore-rename: tweak dirs_removed and relevant_source type
803
- + diffcore-rename: take advantage of "majority rules" to skip more renames
804
- (this branch is used by en/ort-perf-batch-11 and en/ort-readiness.)
805
-
806
- Various rename detection optimization to help "ort" merge strategy
807
- backend.
808
-
809
- Will merge to 'master'.
810
-
811
-
812
-* mt/parallel-checkout-part-2 (2021-04-08) 5 commits
799
+* mt/parallel-checkout-part-2 (2021-04-19) 5 commits
800
- parallel-checkout: add design documentation
801
- parallel-checkout: support progress displaying
802
- parallel-checkout: add configuration options
803
- parallel-checkout: make it truly parallel
804
- unpack-trees: add basic support for parallel checkout
805
806
+ The checkout machinery has been taught to perform the actual
807
+ write-out of the files in parallel when able.
808
+
809
+ Will merge to 'next'.
810
+
811
812
* ds/sparse-index-protections (2021-04-14) 26 commits
821
- - name-hash: use expand_to_path()
822
- - sparse-index: expand_to_path()
823
- - name-hash: don't add directories to name_hash
824
- - revision: ensure full index
825
- - resolve-undo: ensure full index
826
- - read-cache: ensure full index
827
- - pathspec: ensure full index
828
- - merge-recursive: ensure full index
829
- - entry: ensure full index
830
- - dir: ensure full index
831
- - update-index: ensure full index
832
- - stash: ensure full index
833
- - rm: ensure full index
834
- - merge-index: ensure full index
835
- - ls-files: ensure full index
836
- - grep: ensure full index
837
- - fsck: ensure full index
838
- - difftool: ensure full index
839
- - commit: ensure full index
840
- - checkout: ensure full index
841
- - checkout-index: ensure full index
842
- - add: ensure full index
843
- - cache: move ensure_full_index() to cache.h
844
- - read-cache: expand on query into sparse-directory entry
845
- - *: remove 'const' qualifier for struct index_state
846
- - sparse-index: API protection strategy
813
+ (merged to 'next' on 2021-04-17 at f1c40f89ba)
814
+ + name-hash: use expand_to_path()
815
+ + sparse-index: expand_to_path()
816
+ + name-hash: don't add directories to name_hash
817
+ + revision: ensure full index
818
+ + resolve-undo: ensure full index
819
+ + read-cache: ensure full index
820
+ + pathspec: ensure full index
821
+ + merge-recursive: ensure full index
822
+ + entry: ensure full index
823
+ + dir: ensure full index
824
+ + update-index: ensure full index
825
+ + stash: ensure full index
826
+ + rm: ensure full index
827
+ + merge-index: ensure full index
828
+ + ls-files: ensure full index
829
+ + grep: ensure full index
830
+ + fsck: ensure full index
831
+ + difftool: ensure full index
832
+ + commit: ensure full index
833
+ + checkout: ensure full index
834
+ + checkout-index: ensure full index
835
+ + add: ensure full index
836
+ + cache: move ensure_full_index() to cache.h
837
+ + read-cache: expand on query into sparse-directory entry
838
+ + *: remove 'const' qualifier for struct index_state
839
+ + sparse-index: API protection strategy
840
(this branch uses ds/sparse-index.)
841
842
Builds on top of the sparse-index infrastructure to mark operations
843
that are not ready to mark with the sparse index, causing them to
844
fall back on fully-populated index that they always have worked with.
845
853
-
854
-* en/ort-readiness (2021-03-20) 13 commits
855
- (merged to 'next' on 2021-04-08 at 20283a3f10)
856
- + Add testing with merge-ort merge strategy
857
- + t6423: mark remaining expected failure under merge-ort as such
858
- + Revert "merge-ort: ignore the directory rename split conflict for now"
859
- + merge-recursive: add a bunch of FIXME comments documenting known bugs
860
- + merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
861
- + t: mark several submodule merging tests as fixed under merge-ort
862
- + merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
863
- + t6428: new test for SKIP_WORKTREE handling and conflicts
864
- + merge-ort: support subtree shifting
865
- + merge-ort: let renormalization change modify/delete into clean delete
866
- + merge-ort: have ll_merge() use a special attr_index for renormalization
867
- + merge-ort: add a special minimal index just for renormalization
868
- + merge-ort: use STABLE_QSORT instead of QSORT where required
869
- (this branch is used by en/ort-perf-batch-11; uses en/ort-perf-batch-10.)
870
-
871
- Plug the ort merge backend throughout the rest of the system, and
872
- start testing it as a replacement for the recursive backend.
873
-
846
Will merge to 'master'.
847
848
849
* hn/reftable (2021-04-14) 21 commits
878
- - SQUASH??? reftable: prepare for hash-algo recorded in each oid
879
- - Add "test-tool dump-reftable" command.
880
- - git-prompt: prepare for reftable refs backend
881
- - Reftable support for git-core
882
- - reftable: add dump utility
883
- - reftable: implement stack, a mutable database of reftable files.
884
- - reftable: implement refname validation
885
- - reftable: add merged table view
886
- - reftable: add a heap-based priority queue for reftable records
887
- - reftable: reftable file level tests
888
- - reftable: read reftable files
889
- - reftable: generic interface to tables
890
- - reftable: write reftable files
891
- - reftable: a generic binary tree implementation
892
- - reftable: reading/writing blocks
893
- - reftable: (de)serialization for the polymorphic record type.
894
- - reftable: add blocksource, an abstraction for random access reads
895
- - reftable: utility functions
896
- - reftable: add error related functionality
897
- - reftable: add LICENSE
898
- - init-db: set the_repository->hash_algo early on
850
+ . SQUASH??? reftable: prepare for hash-algo recorded in each oid
851
+ . Add "test-tool dump-reftable" command.
852
+ . git-prompt: prepare for reftable refs backend
853
+ . Reftable support for git-core
854
+ . reftable: add dump utility
855
+ . reftable: implement stack, a mutable database of reftable files.
856
+ . reftable: implement refname validation
857
+ . reftable: add merged table view
858
+ . reftable: add a heap-based priority queue for reftable records
859
+ . reftable: reftable file level tests
860
+ . reftable: read reftable files
861
+ . reftable: generic interface to tables
862
+ . reftable: write reftable files
863
+ . reftable: a generic binary tree implementation
864
+ . reftable: reading/writing blocks
865
+ . reftable: (de)serialization for the polymorphic record type.
866
+ . reftable: add blocksource, an abstraction for random access reads
867
+ . reftable: utility functions
868
+ . reftable: add error related functionality
869
+ . reftable: add LICENSE
870
+ . init-db: set the_repository->hash_algo early on
871
872
The "reftable" backend for the refs API.
873
902
- Waiting for reviews.
874
+ Reroll exists; needs picking up.
875
+ cf. <pull.847.v7.git.git.1618832276.gitgitgadget@gmail.com>
876
877
--------------------------------------------------
878
[Discarded]