What's cooking (2020/03 #10)
Junio C Hamano committed
Mar 31, 2020 at 15:58 UTC
ae220561b500450a0c7dd0e38dff1fdbad1853da
1 file changed
+88
-167
whats-cooking.txt
+88
-167
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2020, #09; Sun, 29)
3
+Subject: What's cooking in git.git (Mar 2020, #10; Tue, 31)
4
X-master-at: 9fadedd637b312089337d73c3ed8447e9f0aa775
5
-X-next-at: 6d04fd2bf2c2653e09ae1d75aa42c176da447be8
5
+X-next-at: 2183baf09cb5d1e1dd473e6d197893cd5e1c99ca
6
7
-What's cooking in git.git (Mar 2020, #09; Sun, 29)
7
+What's cooking in git.git (Mar 2020, #10; Tue, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,7 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The first batch of topics after v2.26 are now in 'master'. I plan
16
-to rewind and rebuild 'next' after merging another batch.
15
+The 'next' branch has been rewound and rebuilt.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -21,123 +20,80 @@ of the repositories listed at
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
22
--------------------------------------------------
24
-[Graduated to "master"]
25
-
26
-* ah/force-pull-rebase-configuration (2020-03-10) 1 commit
27
- (merged to 'next' on 2020-03-11 at c79dbbaf9c)
28
- + pull: warn if the user didn't say whether to rebase or to merge
29
-
30
- "git pull" learned to warn when no pull.rebase configuration
31
- exists, and neither --[no-]rebase nor --ff-only is given (which
32
- would result a merge).
33
-
34
-
35
-* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
36
- (merged to 'next' on 2020-03-02 at a1a84d37a7)
37
- + rebase: --fork-point regression fix
38
-
39
- The "--fork-point" mode of "git rebase" regressed when the command
40
- was rewritten in C back in 2.20 era, which has been corrected.
41
-
42
-
43
-* bc/filter-process (2020-03-16) 8 commits
44
- (merged to 'next' on 2020-03-17 at 2cd9dbf794)
45
- + t0021: test filter metadata for additional cases
46
- + builtin/reset: compute checkout metadata for reset
47
- + builtin/rebase: compute checkout metadata for rebases
48
- + builtin/clone: compute checkout metadata for clones
49
- + builtin/checkout: compute checkout metadata for checkouts
50
- + convert: provide additional metadata to filters
51
- + convert: permit passing additional metadata to filter processes
52
- + builtin/checkout: pass branch info down to checkout_worktree
53
-
54
- Provide more information (e.g. the object of the tree-ish in which
55
- the blob being converted appears, in addition to its path, which
56
- has already been given) to smudge/clean conversion filters.
57
-
58
-
59
-* bc/sha-256-part-1-of-4 (2020-02-28) 22 commits
60
- (merged to 'next' on 2020-03-17 at 436c4e64a7)
61
- + fast-import: add options for rewriting submodules
62
- + fast-import: add a generic function to iterate over marks
63
- + fast-import: make find_marks work on any mark set
64
- + fast-import: add helper function for inserting mark object entries
65
- + fast-import: permit reading multiple marks files
66
- + commit: use expected signature header for SHA-256
67
- + worktree: allow repository version 1
68
- + init-db: move writing repo version into a function
69
- + builtin/init-db: add environment variable for new repo hash
70
- + builtin/init-db: allow specifying hash algorithm on command line
71
- + setup: allow check_repository_format to read repository format
72
- + t/helper: make repository tests hash independent
73
- + t/helper: initialize repository if necessary
74
- + t/helper/test-dump-split-index: initialize git repository
75
- + t6300: make hash algorithm independent
76
- + t6300: abstract away SHA-1-specific constants
77
- + t: use hash-specific lookup tables to define test constants
78
- + repository: require a build flag to use SHA-256
79
- + hex: add functions to parse hex object IDs in any algorithm
80
- + hex: introduce parsing variants taking hash algorithms
81
- + hash: implement and use a context cloning function
82
- + builtin/pack-objects: make hash agnostic
83
-
84
- SHA-256 transition continues.
85
-
86
-
87
-* ds/default-pack-use-sparse-to-true (2020-03-20) 2 commits
88
- (merged to 'next' on 2020-03-21 at 25cc87784d)
89
- + pack-objects: flip the use of GIT_TEST_PACK_SPARSE
90
- + config: set pack.useSparse=true by default
91
-
92
- The 'pack.useSparse' configuration variable now defaults to 'true',
93
- enabling an optimization that has been experimental since Git 2.21.
94
-
95
-
96
-* hi/gpg-prefer-check-signature (2020-03-15) 2 commits
97
- (merged to 'next' on 2020-03-17 at 2def2d9a7e)
98
- + gpg-interface: prefer check_signature() for GPG verification
99
- + t: increase test coverage of signature verification output
100
-
101
- The code to interface with GnuPG has been refactored.
102
-
103
-
104
-* jc/describe-misnamed-annotated-tag (2020-02-20) 1 commit
105
- (merged to 'next' on 2020-03-02 at b4e2ca6a46)
106
- + describe: force long format for a name based on a mislocated tag
107
-
108
- When "git describe C" finds an annotated tag with tagname A to be
109
- the best name to explain commit C, and the tag is stored in a
110
- "wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the
111
- command gave a warning message but used A (not B) to describe C.
112
- If C is exactly at the tag, the describe output would be "A", but
113
- "git rev-parse A^0" would not be equal as "git rev-parse C^0". The
114
- behavior of the command has been changed to use the "long" form
115
- i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse.
116
-
117
-
118
-* pb/recurse-submodules-fix (2020-02-19) 6 commits
119
- (merged to 'next' on 2020-03-17 at b46922ddd1)
120
- + t/lib-submodule-update: add test removing nested submodules
121
- + unpack-trees: check for missing submodule directory in merged_entry
122
- + unpack-trees: remove outdated description for verify_clean_submodule
123
- + t/lib-submodule-update: move a test to the right section
124
- + t/lib-submodule-update: remove outdated test description
125
- + t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED
126
-
127
- Fix "git checkout --recurse-submodules" of a nested submodule
128
- hierarchy.
129
-
130
-
131
-* tg/retire-scripted-stash (2020-03-05) 2 commits
132
- (merged to 'next' on 2020-03-05 at 8e82eb9dec)
133
- + stash: remove the stash.useBuiltin setting
134
- + stash: get git_stash_config at the top level
135
-
136
- "git stash" has kept an escape hatch to use the scripted version
137
- for a few releases, which got stale. It has been removed.
23
+[New Topics]
24
+
25
+* ag/rebase-merge-allow-ff-under-abbrev-command (2020-03-30) 2 commits
26
+ - t3432: test `--merge' with `rebase.abbreviateCommands = true', too
27
+ - sequencer: don't abbreviate a command if it doesn't have a short form
28
+
29
+ "git rebase" with the merge backend did not work well when the
30
+ rebase.abbreviateCommands configuration was set.
31
+
32
+ Will merge to 'next'.
33
+
34
+
35
+* jk/oid-array-cleanups (2020-03-30) 7 commits
36
+ - oidset: stop referring to sha1-array
37
+ - ref-filter: stop referring to "sha1 array"
38
+ - bisect: stop referring to sha1_array
39
+ - test-tool: rename sha1-array to oid-array
40
+ - oid_array: rename source file from sha1-array
41
+ - oid_array: use size_t for iteration
42
+ - oid_array: use size_t for count and allocation
43
+
44
+ Code cleanup.
45
+
46
+ Will merge to 'next'.
47
+
48
+
49
+* jx/proc-receive-hook (2020-03-31) 7 commits
50
+ - SQUASH???
51
+ - doc: add documentation for the proc-receive hook
52
+ - receive-pack: refactor report for proc-receive
53
+ - receive-pack: new config receive.procReceiveRefs
54
+ - refs.c: refactor to reuse ref_is_hidden()
55
+ - receive-pack: add new proc-receive hook
56
+ - transport: not report a non-head push as a branch
57
58
--------------------------------------------------
140
-[New Topics]
59
+[Stalled]
60
+
61
+* gs/commit-graph-path-filter (2020-03-30) 16 commits
62
+ - commit-graph: add GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS test flag
63
+ - t4216: add end to end tests for git log with Bloom filters
64
+ - revision.c: add trace2 stats around Bloom filter usage
65
+ - revision.c: use Bloom filters to speed up path based revision walks
66
+ - commit-graph: add --changed-paths option to write subcommand
67
+ - commit-graph: reuse existing Bloom filters during write
68
+ - commit-graph: write Bloom filters to commit graph file
69
+ - diff: skip batch object download when possible
70
+ - commit-graph: examine commits by generation number
71
+ - commit-graph: examine changed-path objects in pack order
72
+ - commit-graph: compute Bloom filters for changed paths
73
+ - diff: halt tree-diff early after max_changes
74
+ - bloom.c: core Bloom filter implementation for changed paths.
75
+ - bloom.c: introduce core Bloom filter constructs
76
+ - bloom.c: add the murmur3 hash implementation
77
+ - commit-graph: define and use MAX_NUM_CHUNKS
78
+
79
+ Introduce an extension to the commit-graph to make it efficient to
80
+ check for the paths that were modified at each commit using Bloom
81
+ filters.
82
+
83
+ Expecting a reroll.
84
+ cf. <fdcbd793-57c2-f5ea-ccb9-cf34e911b669@gmail.com>
85
+ Breakage due to byte-order dependency reported.
86
+
87
+
88
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
89
+ - zlib.c: use size_t for size
90
+
91
+ The wrapper to call into zlib followed our long tradition to use
92
+ "unsigned long" for sizes of regions in memory, which have been
93
+ updated to use "size_t".
94
+
95
+--------------------------------------------------
96
+[Cooking]
97
98
* dr/midx-avoid-int-underflow (2020-03-28) 1 commit
99
- midx.c: fix an integer underflow
@@ -179,7 +135,9 @@ of the repositories listed at
135
136
Documentation updates around the "--recurse-submodules" option.
137
182
- Will merge to 'next'.
138
+ Getting there...
139
+ cf. <F03FAA2F-EDFB-4497-A4E8-3AC267C779FC@gmail.com>
140
+ cf. <1EA4CEB1-D329-4916-A9AC-2F64A7A4F6D0@gmail.com>
141
142
143
* dr/push-remoteref-fix (2020-03-27) 1 commit
@@ -243,7 +201,7 @@ of the repositories listed at
201
Will merge to 'next'.
202
203
246
-* ps/transactional-update-ref-stdin (2020-03-27) 9 commits
204
+* ps/transactional-update-ref-stdin (2020-03-30) 9 commits
205
- update-ref: implement interactive transaction handling
206
- update-ref: read commands in a line-wise fashion
207
- update-ref: move transaction handling into `update_refs_stdin()`
@@ -301,7 +259,7 @@ of the repositories listed at
259
Gitweb update.
260
261
304
-* js/walk-doc-optim (2020-03-28) 1 commit
262
+* js/walk-doc-optim (2020-03-30) 1 commit
263
- MyFirstObjectWalk: remove unnecessary conditional statement
264
265
Code cleanup.
@@ -354,41 +312,6 @@ of the repositories listed at
312
313
Will merge to 'next'.
314
357
---------------------------------------------------
358
-[Stalled]
359
-
360
-* gs/commit-graph-path-filter (2020-02-12) 12 commits
361
- - (bytesex breakage band-aid)
362
- - commit-graph: add GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS test flag
363
- - revision.c: use Bloom filters to speed up path based revision walks
364
- - commit-graph: add --changed-paths option to write subcommand
365
- - commit-graph: reuse existing Bloom filters during write.
366
- - commit-graph: write Bloom filters to commit graph file
367
- - commit-graph: examine commits by generation number
368
- - commit-graph: examine changed-path objects in pack order
369
- - commit-graph: compute Bloom filters for changed paths
370
- - diff: halt tree-diff early after max_changes
371
- - bloom: core Bloom filter implementation for changed paths
372
- - commit-graph: use MAX_NUM_CHUNKS
373
-
374
- Introduce an extension to the commit-graph to make it efficient to
375
- check for the paths that were modified at each commit using Bloom
376
- filters.
377
-
378
- Expecting a reroll.
379
- cf. <fdcbd793-57c2-f5ea-ccb9-cf34e911b669@gmail.com>
380
- Breakage due to byte-order dependency reported.
381
-
382
-
383
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
384
- - zlib.c: use size_t for size
385
-
386
- The wrapper to call into zlib followed our long tradition to use
387
- "unsigned long" for sizes of regions in memory, which have been
388
- updated to use "size_t".
389
-
390
---------------------------------------------------
391
-[Cooking]
315
316
* en/fill-directory-exponential (2020-03-26) 7 commits
317
- dir: replace exponential algorithm with a linear one
@@ -574,8 +497,7 @@ of the repositories listed at
497
repository in which "promised" objects are assumed to be obtainable
498
lazily on-demand from promisor remote repositories.
499
577
- Looking good.
578
- cf. <20200326231416.GC12694@google.com>
500
+ Will merge to 'next'.
501
502
503
* mt/test-lib-bundled-short-options (2020-03-25) 1 commit
@@ -603,8 +525,7 @@ of the repositories listed at
525
cf. <pull.698.v6.git.git.1581691486.gitgitgadget@gmail.com>
526
527
606
-* jt/rebase-allow-duplicate (2020-03-29) 2 commits
607
- - t3402: use POSIX compliant regex(7)
528
+* jt/rebase-allow-duplicate (2020-03-31) 1 commit
529
- rebase --merge: optionally skip upstreamed commits
530
531
Allow "git rebase" to reapply all local commits, even if the may be
@@ -614,13 +535,12 @@ of the repositories listed at
535
cf. <20200318192821.43808-1-jonathantanmy@google.com>
536
537
617
-* bc/faq (2020-03-24) 1 commit
538
+* bc/faq (2020-03-30) 1 commit
539
- docs: add a FAQ
540
541
Doc update.
542
622
- Expecting a reroll.
623
- cf. <20200325110328.GK6499@camp.crustytoothpaste.net>
543
+ Will merge to 'next'.
544
545
546
* jc/log-no-mailmap (2020-03-16) 3 commits
@@ -634,7 +554,8 @@ of the repositories listed at
554
555
556
* tb/commit-graph-split-merge (2020-03-24) 3 commits
637
- - builtin/commit-graph.c: support '--input=graphed'
557
+ (merged to 'next' on 2020-03-31 at 2183baf09c)
558
+ + builtin/commit-graph.c: support '--input=graphed'
559
+ builtin/commit-graph.c: introduce '--input=<source>'
560
+ builtin/commit-graph.c: support '--split[=<strategy>]'
561
@@ -642,7 +563,7 @@ of the repositories listed at
563
options to control if the resulting graph chains should be merged
564
or a single new incremental graph is created.
565
645
- Will merge to 'next'.
566
+ Will merge to 'master'.
567
568
569
* hn/reftable (2020-02-26) 6 commits