What's cooking (2021/08 #08)
Junio C Hamano committed
Aug 23, 2021 at 14:19 UTC
ded2f065b417326184f3c71d5d3e8c701ebe3252
1 file changed
+367
-314
whats-cooking.txt
+367
-314
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2021, #07; Fri, 20)
2
+Subject: What's cooking in git.git (Aug 2021, #08; Mon, 23)
3
X-master-at: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
4
-X-next-at: c128427fd74129b5a9814d069c2d800d1d1e5021
4
+X-next-at: 09f9fbdd9fd7fdf4d572df3ab25b50b66ac29d70
5
6
-What's cooking in git.git (Aug 2021, #07; Fri, 20)
6
+What's cooking in git.git (Aug 2021, #08; Mon, 23)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -17,8 +17,9 @@ useful"). Do not read too much into a topic being in (or not in)
17
'seen'. The ones marked with '.' do not appear in any of the
18
integration branches, but I am still holding onto them.
19
20
-The tip of 'next' has not been rewound yet, but I've been instead
21
-reverting a few topics out of it to prepare.
20
+The tip of 'next' has been rewound, and the first batch of this
21
+cycle should be in 'master' in a few days. As discussed, let's make
22
+'ort' the default early in this cycle.
23
24
Most notably, since the "errno cleanup around refs API" topics have
25
been blocking the "reftable backend" topic, I've reverted the former
@@ -59,12 +60,15 @@ Release tarballs are available at:
60
--------------------------------------------------
61
[New Topics]
62
62
-* sg/make-fix-ar-invocation (2021-08-19) 1 commit
63
- - Makefile: remove archives before manipulating them with 'ar'
64
-
65
-
66
-* ti/tcsh-completion-regression-fix (2021-08-18) 1 commit
67
- - completion: tcsh: Fix regression by drop of wrapper functions
63
+* ps/fetch-optim (2021-08-20) 7 commits
64
+ - fetch: avoid second connectivity check if we already have all objects
65
+ - fetch: refactor fetch refs to be more extendable
66
+ - fetch-pack: optimize loading of refs via commit graph
67
+ - connected: refactor iterator to return next object ID directly
68
+ - fetch: avoid unpacking headers in object existence check
69
+ - fetch: speed up lookup of want refs via commit-graph
70
+ - Merge branch 'ps/connectivity-optim' into ps/fetch-optim
71
+ (this branch uses ps/connectivity-optim.)
72
73
--------------------------------------------------
74
[Stalled]
@@ -132,9 +136,243 @@ Release tarballs are available at:
136
137
Waiting for reviews.
138
139
+
140
+* ab/fsck-unexpected-type (2021-07-12) 21 commits
141
+ - fsck: report invalid object type-path combinations
142
+ - fsck: report invalid types recorded in objects
143
+ - object-store.h: move read_loose_object() below 'struct object_info'
144
+ - fsck: don't hard die on invalid object types
145
+ - object-file.c: return -2 on "header too long" in unpack_loose_header()
146
+ - object-file.c: return -1, not "status" from unpack_loose_header()
147
+ - object-file.c: guard against future bugs in loose_object_info()
148
+ - object-file.c: stop dying in parse_loose_header()
149
+ - object-file.c: split up ternary in parse_loose_header()
150
+ - object-file.c: simplify unpack_loose_short_header()
151
+ - object-file.c: add missing braces to loose_object_info()
152
+ - object-file.c: make parse_loose_header_extended() public
153
+ - object-file.c: don't set "typep" when returning non-zero
154
+ - cache.h: move object functions to object-store.h
155
+ - cat-file tests: test for current --allow-unknown-type behavior
156
+ - cat-file tests: add corrupt loose object test
157
+ - rev-list tests: test for behavior with invalid object types
158
+ - cat-file tests: test that --allow-unknown-type isn't on by default
159
+ - cat-file tests: test for missing object with -t and -s
160
+ - fsck tests: add test for fsck-ing an unknown type
161
+ - fsck tests: refactor one test to use a sub-repo
162
+
163
+ "git fsck" has been taught to report mismatch between expected and
164
+ actual types of an object better.
165
+
166
+ Needs review.
167
+
168
--------------------------------------------------
169
[Cooking]
170
171
+* ps/fetch-pack-load-refs-optim (2021-08-04) 1 commit
172
+ (merged to 'next' on 2021-08-23 at 09f9fbdd9f)
173
+ + fetch-pack: speed up loading of refs via commit graph
174
+
175
+ Originally merged to 'next' on 2021-08-09
176
+
177
+ Loading of ref tips to prepare for common ancestry negotiation in
178
+ "git fetch-pack" has been optimized by taking advantage of the
179
+ commit graph when available.
180
+
181
+ Will merge to 'master'.
182
+
183
+
184
+* jc/bisect-sans-show-branch (2021-07-28) 2 commits
185
+ (merged to 'next' on 2021-08-23 at 4d01043b2e)
186
+ + bisect: simplify return code from bisect_checkout()
187
+ + bisect: do not run show-branch just to show the current commit
188
+
189
+ Originally merged to 'next' on 2021-08-02
190
+
191
+ "git bisect" spawned "git show-branch" only to pretty-print the
192
+ title of the commit after checking out the next version to be
193
+ tested; this has been rewritten in C.
194
+
195
+ Will merge to 'master'.
196
+
197
+
198
+* ab/http-drop-old-curl (2021-07-30) 5 commits
199
+ (merged to 'next' on 2021-08-23 at 70188594a0)
200
+ + http: rename CURLOPT_FILE to CURLOPT_WRITEDATA
201
+ + http: drop support for curl < 7.19.3 and < 7.17.0 (again)
202
+ + http: drop support for curl < 7.19.4
203
+ + http: drop support for curl < 7.16.0
204
+ + http: drop support for curl < 7.11.1
205
+
206
+ Originally merged to 'next' on 2021-08-02
207
+
208
+ Support for ancient versions of cURL library has been dropped.
209
+
210
+ Will merge to 'master'.
211
+
212
+
213
+* ds/add-with-sparse-index (2021-07-29) 5 commits
214
+ (merged to 'next' on 2021-08-23 at 179c4747ac)
215
+ + add: remove ensure_full_index() with --renormalize
216
+ + add: ignore outside the sparse-checkout in refresh()
217
+ + pathspec: stop calling ensure_full_index
218
+ + add: allow operating on a sparse-only index
219
+ + t1092: test merge conflicts outside cone
220
+ (this branch is used by ds/sparse-index-ignored-files.)
221
+
222
+ Originally merged to 'next' on 2021-08-02
223
+
224
+ "git add" can work better with the sparse index.
225
+
226
+ Will merge to 'master'.
227
+
228
+
229
+* en/ort-perf-batch-15 (2021-08-03) 9 commits
230
+ (merged to 'next' on 2021-08-23 at d22a850986)
231
+ + merge-ort: remove compile-time ability to turn off usage of memory pools
232
+ + merge-ort: reuse path strings in pool_alloc_filespec
233
+ + merge-ort: store filepairs and filespecs in our mem_pool
234
+ + diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
235
+ + merge-ort: switch our strmaps over to using memory pools
236
+ + merge-ort: set up a memory pool
237
+ + merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
238
+ + diffcore-rename: use a mem_pool for exact rename detection's hashmap
239
+ + merge-ort: rename str{map,intmap,set}_func()
240
+
241
+ Originally merged to 'next' on 2021-08-04
242
+
243
+ Final batch for "merge -sort" optimization.
244
+
245
+ Will merge to 'master'.
246
+
247
+
248
+* js/expand-runtime-prefix (2021-07-26) 6 commits
249
+ (merged to 'next' on 2021-08-23 at cf274b0177)
250
+ + expand_user_path: allow in-flight topics to keep using the old name
251
+ + interpolate_path(): allow specifying paths relative to the runtime prefix
252
+ + Use a better name for the function interpolating paths
253
+ + expand_user_path(): clarify the role of the `real_home` parameter
254
+ + expand_user_path(): remove stale part of the comment
255
+ + tests: exercise the RUNTIME_PREFIX feature
256
+
257
+ Originally merged to 'next' on 2021-08-04
258
+
259
+ Pathname expansion (like "~username/") learned a way to specify a
260
+ location relative to Git installation (e.g. its $sharedir which is
261
+ $(prefix)/share), with "%(prefix)".
262
+
263
+ Will merge to 'master'.
264
+
265
+
266
+* hn/refs-test-cleanup (2021-08-02) 11 commits
267
+ (merged to 'next' on 2021-08-23 at 96fe62cbc1)
268
+ + t6001: avoid direct file system access
269
+ + t6500: use "ls -1" to snapshot ref database state
270
+ + t7064: use update-ref -d to remove upstream branch
271
+ + t1410: mark test as REFFILES
272
+ + t1405: mark test for 'git pack-refs' as REFFILES
273
+ + t1405: use 'git reflog exists' to check reflog existence
274
+ + t2402: use ref-store test helper to create broken symlink
275
+ + t3320: use git-symbolic-ref rather than filesystem access
276
+ + t6120: use git-update-ref rather than filesystem access
277
+ + t1503: mark symlink test as REFFILES
278
+ + t6050: use git-update-ref rather than filesystem access
279
+
280
+ Originally merged to 'next' on 2021-08-04
281
+
282
+ A handful of tests that assumed implementation details of files
283
+ backend for refs have been cleaned up.
284
+
285
+ Will merge to 'master'.
286
+
287
+
288
+* ab/bundle-doc (2021-08-02) 4 commits
289
+ (merged to 'next' on 2021-08-23 at af25d34e71)
290
+ + bundle doc: replace "basis" with "prerequsite(s)"
291
+ + bundle doc: elaborate on rev<->ref restriction
292
+ + bundle doc: elaborate on object prerequisites
293
+ + bundle doc: rewrite the "DESCRIPTION" section
294
+
295
+ Originally merged to 'next' on 2021-08-04
296
+
297
+ Doc update.
298
+
299
+ Will merge to 'master'.
300
+
301
+
302
+* ab/pack-stdin-packs-fix (2021-07-09) 2 commits
303
+ (merged to 'next' on 2021-08-23 at ec9d0ba95f)
304
+ + pack-objects: fix segfault in --stdin-packs option
305
+ + pack-objects tests: cover blindspots in stdin handling
306
+
307
+ Originally merged to 'next' on 2021-08-04
308
+
309
+ Input validation of "git pack-objects --stdin-packs" has been
310
+ corrected.
311
+
312
+ Will merge to 'master'.
313
+
314
+
315
+* jt/push-negotiation-fixes (2021-07-15) 3 commits
316
+ (merged to 'next' on 2021-08-23 at 6b3dcc1092)
317
+ + fetch: die on invalid --negotiation-tip hash
318
+ + send-pack: fix push nego. when remote has refs
319
+ + send-pack: fix push.negotiate with remote helper
320
+
321
+ Originally merged to 'next' on 2021-08-09
322
+
323
+ Bugfix for common ancestor negotiation recently introduced in "git
324
+ push" codepath.
325
+
326
+ Will merge to 'master'.
327
+
328
+
329
+* zh/ref-filter-raw-data (2021-07-26) 6 commits
330
+ (merged to 'next' on 2021-08-23 at 5c06fb48a5)
331
+ + ref-filter: add %(rest) atom
332
+ + ref-filter: use non-const ref_format in *_atom_parser()
333
+ + ref-filter: --format=%(raw) support --perl
334
+ + ref-filter: add %(raw) atom
335
+ + ref-filter: add obj-type check in grab contents
336
+ + Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data
337
+
338
+ Originally merged to 'next' on 2021-08-04
339
+
340
+ Prepare the "ref-filter" machinery that drives the "--format"
341
+ option of "git for-each-ref" and its friends to be used in "git
342
+ cat-file --batch".
343
+
344
+ Will merge to 'master'.
345
+
346
+
347
+* es/trace2-log-parent-process-name (2021-07-22) 2 commits
348
+ (merged to 'next' on 2021-08-23 at a93182081d)
349
+ + tr2: log parent process name
350
+ + tr2: make process info collection platform-generic
351
+
352
+ Originally merged to 'next' on 2021-08-04
353
+
354
+ trace2 logs learned to show parent process name to see in what
355
+ context Git was invoked.
356
+
357
+ Will merge to 'master'.
358
+
359
+
360
+* sg/make-fix-ar-invocation (2021-08-19) 1 commit
361
+ - Makefile: remove archives before manipulating them with 'ar'
362
+
363
+ Build fix.
364
+
365
+ Will merge to 'next'.
366
+
367
+
368
+* ti/tcsh-completion-regression-fix (2021-08-18) 1 commit
369
+ - completion: tcsh: Fix regression by drop of wrapper functions
370
+
371
+ Update to the command line completion (in contrib/) for tcsh.
372
+
373
+ Will merge to 'next'.
374
+
375
+
376
* fc/completion-updates (2021-08-18) 4 commits
377
- completion: bash: add correct suffix in variables
378
- completion: bash: fix for multiple dash commands
@@ -143,7 +381,7 @@ Release tarballs are available at:
381
382
Command line completion updates.
383
146
- Will merge to 'next'?
384
+ Will merge to 'next'.
385
386
387
* ar/submodule-run-update-procedure (2021-08-13) 1 commit
@@ -183,14 +421,16 @@ Release tarballs are available at:
421
to true.
422
423
186
-* pw/rebase-r-fixes (2021-08-15) 4 commits
424
+* pw/rebase-r-fixes (2021-08-23) 4 commits
425
- rebase -r: fix merge -c with a merge strategy
426
- rebase -r: don't write .git/MERGE_MSG when fast-forwarding
189
- - rebase -i: Add another reword test
427
+ - rebase -i: add another reword test
428
- rebase -r: make 'merge -c' behave like reword
429
430
Various bugs in "git rebase -r" have been fixed.
431
432
+ Will merge to 'next'.
433
+
434
435
* th/userdiff-more-java (2021-08-11) 1 commit
436
- userdiff: improve java hunk header regex
@@ -200,13 +440,15 @@ Release tarballs are available at:
440
Will merge to 'next'.
441
442
203
-* zh/cherry-pick-advice (2021-08-14) 1 commit
443
+* zh/cherry-pick-advice (2021-08-23) 1 commit
444
- cherry-pick: use better advice message
445
446
The advice message that "git cherry-pick" gives when it asks
447
conflicted replay of a commit to be resolved by the end user has
448
been updated.
449
450
+ Will merge to 'next'?
451
+
452
453
* es/config-based-hooks (2021-08-19) 7 commits
454
- hook: allow out-of-repo 'git hook' invocations
@@ -222,6 +464,7 @@ Release tarballs are available at:
464
upon the same event and control via the configuration variables.
465
466
Will merge to 'next'?
467
+ cf. <87v93wflm0.fsf@evledraar.gmail.com>
468
469
470
* mk/clone-recurse-submodules (2021-08-18) 2 commits
@@ -388,23 +631,13 @@ Release tarballs are available at:
631
an alternate object store" mechanism (which is suboptimal).
632
633
391
-* ps/fetch-pack-load-refs-optim (2021-08-04) 1 commit
392
- (merged to 'next' on 2021-08-09 at 4744a01fd5)
393
- + fetch-pack: speed up loading of refs via commit graph
394
-
395
- Loading of ref tips to prepare for common ancestry negotiation in
396
- "git fetch-pack" has been optimized by taking advantage of the
397
- commit graph when available.
398
-
399
- Will cook in 'next'.
400
-
401
-
634
* ps/connectivity-optim (2021-08-09) 5 commits
635
- revision: avoid hitting packfiles when commits are in commit-graph
636
- commit-graph: split out function to search commit position
637
- revision: stop retrieving reference twice
638
- connected: do not sort input revisions
639
- revision: separate walk and unsorted flags
640
+ (this branch is used by ps/fetch-optim.)
641
642
The revision traversal API has been optimized by taking advantage
643
of the commit-graph, when available, to determine if a commit is
@@ -437,17 +670,6 @@ Release tarballs are available at:
670
Build update.
671
672
440
-* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit
441
- - refs: drop unused "flags" parameter to lock_ref_oid_basic()
442
- (this branch is used by hn/refs-errno-cleanup; uses ab/refs-files-cleanup.)
443
-
444
- Code cleanup.
445
-
446
- Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
447
- I suspect that ab/refs-files-cleanup can fix its commit by
448
- squashing it in, but I'll leave that to the owner of the topic.
449
-
450
-
673
* en/merge-strategy-docs (2021-08-05) 10 commits
674
- Update error message and code comment
675
- merge-strategies.txt: add coverage of the `ort` merge strategy
@@ -494,18 +716,6 @@ Release tarballs are available at:
716
cf. <20210802174944.53745-1-oystwa@gmail.com>
717
718
497
-* jc/bisect-sans-show-branch (2021-07-28) 2 commits
498
- (merged to 'next' on 2021-08-02 at 89a8d9a47b)
499
- + bisect: simplify return code from bisect_checkout()
500
- + bisect: do not run show-branch just to show the current commit
501
-
502
- "git bisect" spawned "git show-branch" only to pretty-print the
503
- title of the commit after checking out the next version to be
504
- tested; this has been rewritten in C.
505
-
506
- Will cook in 'next'.
507
-
508
-
719
* jc/trivial-threeway-binary-merge (2021-07-28) 1 commit
720
- ll-merge: teach ll_binary_merge() a trivial three-way merge
721
@@ -519,19 +729,6 @@ Release tarballs are available at:
729
apply.c::three_way_merge().
730
731
522
-* ab/http-drop-old-curl (2021-07-30) 5 commits
523
- (merged to 'next' on 2021-08-02 at b382ac042f)
524
- + http: rename CURLOPT_FILE to CURLOPT_WRITEDATA
525
- + http: drop support for curl < 7.19.3 and < 7.17.0 (again)
526
- + http: drop support for curl < 7.19.4
527
- + http: drop support for curl < 7.16.0
528
- + http: drop support for curl < 7.11.1
529
-
530
- Support for ancient versions of cURL library has been dropped.
531
-
532
- Will cook in 'next'.
533
-
534
-
732
* ab/lib-subtest (2021-08-05) 11 commits
733
- test-lib tests: assert 1 exit code, not non-zero
734
- test-lib tests: refactor common part of check_sub_test_lib_test*()
@@ -548,20 +745,6 @@ Release tarballs are available at:
745
Updates to the tests in t0000 to test the test framework.
746
747
551
-* ds/add-with-sparse-index (2021-07-29) 5 commits
552
- (merged to 'next' on 2021-08-02 at ee3e1323bb)
553
- + add: remove ensure_full_index() with --renormalize
554
- + add: ignore outside the sparse-checkout in refresh()
555
- + pathspec: stop calling ensure_full_index
556
- + add: allow operating on a sparse-only index
557
- + t1092: test merge conflicts outside cone
558
- (this branch is used by ds/sparse-index-ignored-files.)
559
-
560
- "git add" can work better with the sparse index.
561
-
562
- Will cook in 'next'.
563
-
564
-
748
* ab/only-single-progress-at-once (2021-07-23) 8 commits
749
- progress.c: add & assert a "global_progress" variable
750
- pack-bitmap-write.c: add a missing stop_progress()
@@ -594,51 +777,6 @@ Release tarballs are available at:
777
Large part of "git submodule add" gets rewritten in C.
778
779
597
-* en/ort-perf-batch-15 (2021-08-03) 9 commits
598
- (merged to 'next' on 2021-08-04 at 87fc290e71)
599
- + merge-ort: remove compile-time ability to turn off usage of memory pools
600
- + merge-ort: reuse path strings in pool_alloc_filespec
601
- + merge-ort: store filepairs and filespecs in our mem_pool
602
- + diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
603
- + merge-ort: switch our strmaps over to using memory pools
604
- + merge-ort: set up a memory pool
605
- + merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
606
- + diffcore-rename: use a mem_pool for exact rename detection's hashmap
607
- + merge-ort: rename str{map,intmap,set}_func()
608
-
609
- Final batch for "merge -sort" optimization.
610
-
611
- Will cook in 'next'.
612
-
613
-
614
-* js/expand-runtime-prefix (2021-07-26) 6 commits
615
- (merged to 'next' on 2021-08-04 at b95a81a004)
616
- + expand_user_path: allow in-flight topics to keep using the old name
617
- + interpolate_path(): allow specifying paths relative to the runtime prefix
618
- + Use a better name for the function interpolating paths
619
- + expand_user_path(): clarify the role of the `real_home` parameter
620
- + expand_user_path(): remove stale part of the comment
621
- + tests: exercise the RUNTIME_PREFIX feature
622
-
623
- Pathname expansion (like "~username/") learned a way to specify a
624
- location relative to Git installation (e.g. its $sharedir which is
625
- $(prefix)/share), with "%(prefix)".
626
-
627
- Will cook in 'next'.
628
-
629
-
630
-* zh/cherry-pick-help-is-only-for-sequencer (2021-08-03) 2 commits
631
- (merged to 'next' on 2021-08-04 at 9ea14ed106)
632
- + cherry-pick: use better advice message
633
- + cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
634
-
635
- "git cherry-pick" loses its state file when a stray
636
- GIT_CHERRY_PICK_HELP environment is present, which has been
637
- corrected.
638
-
639
- Will cook in 'next'.
640
-
641
-
780
* dt/submodule-diff-fixes (2021-08-11) 3 commits
781
- diff --submodule=diff: don't print failure message twice
782
- diff --submodule=diff: do not fail on ever-initialied deleted submodules
@@ -668,77 +806,6 @@ Release tarballs are available at:
806
Comments?
807
808
671
-* hn/refs-test-cleanup (2021-08-02) 11 commits
672
- (merged to 'next' on 2021-08-04 at 5651c32f4b)
673
- + t6001: avoid direct file system access
674
- + t6500: use "ls -1" to snapshot ref database state
675
- + t7064: use update-ref -d to remove upstream branch
676
- + t1410: mark test as REFFILES
677
- + t1405: mark test for 'git pack-refs' as REFFILES
678
- + t1405: use 'git reflog exists' to check reflog existence
679
- + t2402: use ref-store test helper to create broken symlink
680
- + t3320: use git-symbolic-ref rather than filesystem access
681
- + t6120: use git-update-ref rather than filesystem access
682
- + t1503: mark symlink test as REFFILES
683
- + t6050: use git-update-ref rather than filesystem access
684
-
685
- A handful of tests that assumed implementation details of files
686
- backend for refs have been cleaned up.
687
-
688
- Will cook in 'next'.
689
-
690
-
691
-* hn/reftable (2021-08-18) 25 commits
692
- - t1404: annotate test cases with REFFILES
693
- - t1401,t2011: parameterize HEAD.lock for REFFILES
694
- - t1301: document what needs to be done for reftable
695
- - reftable: add "test-tool dump-reftable" command.
696
- - git-prompt: prepare for reftable refs backend
697
- - refs: RFC: Reftable support for git-core
698
- - reftable: add dump utility
699
- - reftable: implement stack, a mutable database of reftable files.
700
- - reftable: implement refname validation
701
- - reftable: add merged table view
702
- - reftable: add a heap-based priority queue for reftable records
703
- - reftable: reftable file level tests
704
- - reftable: read reftable files
705
- - reftable: generic interface to tables
706
- - reftable: write reftable files
707
- - reftable: a generic binary tree implementation
708
- - reftable: reading/writing blocks
709
- - compat: provide zlib's uncompress2 from compat/zlib-compat.c
710
- - reftable: (de)serialization for the polymorphic record type.
711
- - reftable: add blocksource, an abstraction for random access reads
712
- - reftable: utility functions
713
- - reftable: add error related functionality
714
- - reftable: RFC: add LICENSE
715
- - init-db: set the_repository->hash_algo early on
716
- - hash.h: provide constants for the hash IDs
717
-
718
- The "reftable" backend for the refs API.
719
-
720
-
721
-* ab/refs-files-cleanup (2021-08-19) 11 commits
722
- - refs/files: remove unused "errno != ENOTDIR" condition
723
- - refs/files: remove unused "errno == EISDIR" code
724
- - refs/files: remove unused "oid" in lock_ref_oid_basic()
725
- - reflog expire: don't lock reflogs using previously seen OID
726
- - refs/files: add a comment about refs_reflog_exists() call
727
- - refs: make repo_dwim_log() accept a NULL oid
728
- - refs/debug: re-indent argument list for "prepare"
729
- - refs/files: remove unused "skip" in lock_raw_ref() too
730
- - refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
731
- - refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
732
- - refs/packet: add missing BUG() invocations to reflog callbacks
733
- (this branch is used by hn/refs-errno-cleanup and jk/refs-files-cleanup-cleanup.)
734
-
735
- Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
736
-
737
- I suspect that jk/refs-files-cleanup-cleanup should be squashed
738
- into the commits in this topic, but I'll leave that to the owner of
739
- the topic.
740
-
741
-
809
* en/pull-conflicting-options (2021-07-22) 8 commits
810
- pull: fix handling of multiple heads
811
- pull: update docs & code for option compatibility with rebasing
@@ -767,41 +834,6 @@ Release tarballs are available at:
834
cf. <xmqqsg0ri5mq.fsf@gitster.g>
835
836
770
-* ab/bundle-doc (2021-08-02) 4 commits
771
- (merged to 'next' on 2021-08-04 at b3b3b0fa98)
772
- + bundle doc: replace "basis" with "prerequsite(s)"
773
- + bundle doc: elaborate on rev<->ref restriction
774
- + bundle doc: elaborate on object prerequisites
775
- + bundle doc: rewrite the "DESCRIPTION" section
776
-
777
- Doc update.
778
-
779
- Will cook in 'next'.
780
-
781
-
782
-* ab/pack-stdin-packs-fix (2021-07-09) 2 commits
783
- (merged to 'next' on 2021-08-04 at f464b74a6f)
784
- + pack-objects: fix segfault in --stdin-packs option
785
- + pack-objects tests: cover blindspots in stdin handling
786
-
787
- Input validation of "git pack-objects --stdin-packs" has been
788
- corrected.
789
-
790
- Will cook in 'next'.
791
-
792
-
793
-* jt/push-negotiation-fixes (2021-07-15) 3 commits
794
- (merged to 'next' on 2021-08-09 at ea7da8239c)
795
- + fetch: die on invalid --negotiation-tip hash
796
- + send-pack: fix push nego. when remote has refs
797
- + send-pack: fix push.negotiate with remote helper
798
-
799
- Bugfix for common ancestor negotiation recently introduced in "git
800
- push" codepath.
801
-
802
- Will cook in 'next'.
803
-
804
-
837
* ab/make-tags-cleanup (2021-08-05) 5 commits
838
- Makefile: normalize clobbering & xargs for tags targets
839
- Makefile: remove "cscope.out", not "cscope*" in cscope.out target
@@ -912,46 +944,6 @@ Release tarballs are available at:
944
Expecting a reroll.
945
946
915
-* pw/diff-color-moved-fix (2021-08-05) 13 commits
916
- (merged to 'next' on 2021-08-05 at 7b5e312aac)
917
- + diff: drop unused options parameter from cmp_in_block_with_wsd()
918
- (merged to 'next' on 2021-08-04 at 4de4a451e0)
919
- + diff --color-moved: intern strings
920
- + diff: use designated initializers for emitted_diff_symbol
921
- + diff --color-moved-ws=allow-indentation-change: improve hash lookups
922
- + diff --color-moved: stop clearing potential moved blocks
923
- + diff --color-moved: shrink potential moved blocks as we go
924
- + diff --color-moved: unify moved block growth functions
925
- + diff --color-moved: call comparison function directly
926
- + diff --color-moved-ws=allow-indentation-change: simplify and optimize
927
- + diff: simplify allow-indentation-change delta calculation
928
- + diff --color-moved: avoid false short line matches and bad zerba coloring
929
- + diff --color-moved=zebra: fix alternate coloring
930
- + diff --color-moved: add perf tests
931
-
932
- Long-overdue correctness and performance update to "diff
933
- --color-moved" feature.
934
-
935
- Eject for reroll.
936
- cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
937
-
938
-
939
-* hn/refs-errno-cleanup (2021-08-19) 7 commits
940
- - refs: make errno output explicit for refs_resolve_ref_unsafe
941
- - refs: explicitly return failure_errno from parse_loose_ref_contents
942
- - refs: add failure_errno to refs_read_raw_ref() signature
943
- - refs: make errno output explicit for read_raw_ref_fn
944
- - refs/files-backend: stop setting errno from lock_ref_oid_basic
945
- - refs: remove EINVAL errno output from specification of read_raw_ref_fn
946
- - refs file backend: move raceproof_create_file() here
947
- (this branch uses ab/refs-files-cleanup and jk/refs-files-cleanup-cleanup.)
948
-
949
- Futz with the way 'errno' is relied on in the refs API to carry the
950
- failure modes up the callchain.
951
-
952
- Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
953
-
954
-
947
* ab/test-tool-cache-cleanup (2021-06-08) 4 commits
948
- read-cache perf: add a perf test for refresh_index()
949
- test-tool: migrate read-cache-again to parse_options()
@@ -975,20 +967,106 @@ Release tarballs are available at:
967
Waiting for reviews.
968
969
978
-* zh/ref-filter-raw-data (2021-07-26) 6 commits
979
- (merged to 'next' on 2021-08-04 at 4c4529d8d0)
980
- + ref-filter: add %(rest) atom
981
- + ref-filter: use non-const ref_format in *_atom_parser()
982
- + ref-filter: --format=%(raw) support --perl
983
- + ref-filter: add %(raw) atom
984
- + ref-filter: add obj-type check in grab contents
985
- + Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data
970
+* pw/diff-color-moved-fix (2021-08-05) 13 commits
971
+ - diff: drop unused options parameter from cmp_in_block_with_wsd()
972
+ - diff --color-moved: intern strings
973
+ - diff: use designated initializers for emitted_diff_symbol
974
+ - diff --color-moved-ws=allow-indentation-change: improve hash lookups
975
+ - diff --color-moved: stop clearing potential moved blocks
976
+ - diff --color-moved: shrink potential moved blocks as we go
977
+ - diff --color-moved: unify moved block growth functions
978
+ - diff --color-moved: call comparison function directly
979
+ - diff --color-moved-ws=allow-indentation-change: simplify and optimize
980
+ - diff: simplify allow-indentation-change delta calculation
981
+ - diff --color-moved: avoid false short line matches and bad zerba coloring
982
+ - diff --color-moved=zebra: fix alternate coloring
983
+ - diff --color-moved: add perf tests
984
+
985
+ Originally merged to 'next' on 2021-08-05
986
987
- Prepare the "ref-filter" machinery that drives the "--format"
988
- option of "git for-each-ref" and its friends to be used in "git
989
- cat-file --batch".
987
+ Long-overdue correctness and performance update to "diff
988
+ --color-moved" feature.
989
+
990
+ Eject for reroll.
991
+ cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
992
+
993
+
994
+* hn/reftable (2021-08-18) 25 commits
995
+ - t1404: annotate test cases with REFFILES
996
+ - t1401,t2011: parameterize HEAD.lock for REFFILES
997
+ - t1301: document what needs to be done for reftable
998
+ - reftable: add "test-tool dump-reftable" command.
999
+ - git-prompt: prepare for reftable refs backend
1000
+ - refs: RFC: Reftable support for git-core
1001
+ - reftable: add dump utility
1002
+ - reftable: implement stack, a mutable database of reftable files.
1003
+ - reftable: implement refname validation
1004
+ - reftable: add merged table view
1005
+ - reftable: add a heap-based priority queue for reftable records
1006
+ - reftable: reftable file level tests
1007
+ - reftable: read reftable files
1008
+ - reftable: generic interface to tables
1009
+ - reftable: write reftable files
1010
+ - reftable: a generic binary tree implementation
1011
+ - reftable: reading/writing blocks
1012
+ - compat: provide zlib's uncompress2 from compat/zlib-compat.c
1013
+ - reftable: (de)serialization for the polymorphic record type.
1014
+ - reftable: add blocksource, an abstraction for random access reads
1015
+ - reftable: utility functions
1016
+ - reftable: add error related functionality
1017
+ - reftable: RFC: add LICENSE
1018
+ - init-db: set the_repository->hash_algo early on
1019
+ - hash.h: provide constants for the hash IDs
1020
+
1021
+ The "reftable" backend for the refs API.
1022
+
1023
+
1024
+* ab/refs-files-cleanup (2021-08-19) 11 commits
1025
+ - refs/files: remove unused "errno != ENOTDIR" condition
1026
+ - refs/files: remove unused "errno == EISDIR" code
1027
+ - refs/files: remove unused "oid" in lock_ref_oid_basic()
1028
+ - reflog expire: don't lock reflogs using previously seen OID
1029
+ - refs/files: add a comment about refs_reflog_exists() call
1030
+ - refs: make repo_dwim_log() accept a NULL oid
1031
+ - refs/debug: re-indent argument list for "prepare"
1032
+ - refs/files: remove unused "skip" in lock_raw_ref() too
1033
+ - refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
1034
+ - refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
1035
+ - refs/packet: add missing BUG() invocations to reflog callbacks
1036
+ (this branch is used by hn/refs-errno-cleanup and jk/refs-files-cleanup-cleanup.)
1037
+
1038
+ Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
1039
+
1040
+ I suspect that jk/refs-files-cleanup-cleanup should be squashed
1041
+ into the commits in this topic, but I'll leave that to the owner of
1042
+ the topic.
1043
991
- Will cook in 'next'.
1044
+
1045
+* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit
1046
+ - refs: drop unused "flags" parameter to lock_ref_oid_basic()
1047
+ (this branch is used by hn/refs-errno-cleanup; uses ab/refs-files-cleanup.)
1048
+
1049
+ Code cleanup.
1050
+
1051
+ Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
1052
+ I suspect that ab/refs-files-cleanup can fix its commit by
1053
+ squashing it in, but I'll leave that to the owner of the topic.
1054
+
1055
+
1056
+* hn/refs-errno-cleanup (2021-08-19) 7 commits
1057
+ - refs: make errno output explicit for refs_resolve_ref_unsafe
1058
+ - refs: explicitly return failure_errno from parse_loose_ref_contents
1059
+ - refs: add failure_errno to refs_read_raw_ref() signature
1060
+ - refs: make errno output explicit for read_raw_ref_fn
1061
+ - refs/files-backend: stop setting errno from lock_ref_oid_basic
1062
+ - refs: remove EINVAL errno output from specification of read_raw_ref_fn
1063
+ - refs file backend: move raceproof_create_file() here
1064
+ (this branch uses ab/refs-files-cleanup and jk/refs-files-cleanup-cleanup.)
1065
+
1066
+ Futz with the way 'errno' is relied on in the refs API to carry the
1067
+ failure modes up the callchain.
1068
+
1069
+ Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
1070
1071
1072
* jh/builtin-fsmonitor (2021-07-12) 35 commits
@@ -1033,42 +1111,17 @@ Release tarballs are available at:
1111
1112
Expecting a reroll post 2.33 release.
1113
1114
+--------------------------------------------------
1115
+[Discarded]
1116
1037
-* es/trace2-log-parent-process-name (2021-07-22) 2 commits
1038
- (merged to 'next' on 2021-08-04 at 47e35c31b0)
1039
- + tr2: log parent process name
1040
- + tr2: make process info collection platform-generic
1041
-
1042
- trace2 logs learned to show parent process name to see in what
1043
- context Git was invoked.
1044
-
1045
- Will cook in 'next'.
1117
+* zh/cherry-pick-help-is-only-for-sequencer (2021-08-03) 2 commits
1118
+ . cherry-pick: use better advice message
1119
+ . cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
1120
1121
+ Originally merged to 'next' on 2021-08-04
1122
1048
-* ab/fsck-unexpected-type (2021-07-12) 21 commits
1049
- - fsck: report invalid object type-path combinations
1050
- - fsck: report invalid types recorded in objects
1051
- - object-store.h: move read_loose_object() below 'struct object_info'
1052
- - fsck: don't hard die on invalid object types
1053
- - object-file.c: return -2 on "header too long" in unpack_loose_header()
1054
- - object-file.c: return -1, not "status" from unpack_loose_header()
1055
- - object-file.c: guard against future bugs in loose_object_info()
1056
- - object-file.c: stop dying in parse_loose_header()
1057
- - object-file.c: split up ternary in parse_loose_header()
1058
- - object-file.c: simplify unpack_loose_short_header()
1059
- - object-file.c: add missing braces to loose_object_info()
1060
- - object-file.c: make parse_loose_header_extended() public
1061
- - object-file.c: don't set "typep" when returning non-zero
1062
- - cache.h: move object functions to object-store.h
1063
- - cat-file tests: test for current --allow-unknown-type behavior
1064
- - cat-file tests: add corrupt loose object test
1065
- - rev-list tests: test for behavior with invalid object types
1066
- - cat-file tests: test that --allow-unknown-type isn't on by default
1067
- - cat-file tests: test for missing object with -t and -s
1068
- - fsck tests: add test for fsck-ing an unknown type
1069
- - fsck tests: refactor one test to use a sub-repo
1070
-
1071
- "git fsck" has been taught to report mismatch between expected and
1072
- actual types of an object better.
1123
+ "git cherry-pick" loses its state file when a stray
1124
+ GIT_CHERRY_PICK_HELP environment is present, which has been
1125
+ corrected.
1126
1074
- Needs review.
1127
+ Reverted out of 'next' at 1f62d2e1 on 2021-08-11