What's cooking (2020/03 #05)
Junio C Hamano committed
Mar 17, 2020 at 16:49 UTC
f3cfebe57902a7e09f3f697576ac722959e47817
1 file changed
+111
-160
whats-cooking.txt
+111
-160
@@ -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, #04; Mon, 16)
4
-X-master-at: 6c85aac65fb455af85745130ce35ddae4678db84
5
-X-next-at: e327a58236cc95b4efc12994231bc709cb52d153
3
+Subject: What's cooking in git.git (Mar 2020, #05; Tue, 17)
4
+X-master-at: be8661a3286c67a5d4088f4226cbd7f8b76544b0
5
+X-next-at: afcc196a35dfc757a1018548c1f32afeb8a936d2
6
7
-What's cooking in git.git (Mar 2020, #04; Mon, 16)
7
+What's cooking in git.git (Mar 2020, #05; Tue, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,135 +12,15 @@ 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
-Git 2.26-rc2 has been tagged.
15
+Git 2.26-rc2 has been tagged. Many fixes accumulated on the
16
+'master' front have been flushed to 'maint' and has been tagged
17
+as Git 2.25.2.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
21
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
22
---------------------------------------------------
23
-[Graduated to "master"]
24
-
25
-* dr/push-remote-ref-update (2020-03-03) 1 commit
26
- (merged to 'next' on 2020-03-09 at 5a72128815)
27
- + remote: drop "explicit" parameter from remote_ref_for_branch()
28
-
29
- Code clean-up.
30
-
31
-
32
-* ds/sparse-add (2020-03-09) 1 commit
33
- (merged to 'next' on 2020-03-09 at 4e675cfd89)
34
- + t1091: don't grep for `strerror()` string
35
-
36
- Test fix.
37
-
38
-
39
-* en/rebase-backend (2020-03-11) 3 commits
40
- (merged to 'next' on 2020-03-11 at 52a3c30dc4)
41
- + git-rebase.txt: highlight backend differences with commit rewording
42
- + sequencer: clear state upon dropping a become-empty commit
43
- + i18n: unmark a message in rebase.c
44
-
45
- Band-aid fixes for two fallouts from switching the default "rebase"
46
- backend.
47
-
48
-
49
-* en/test-cleanup (2020-03-13) 1 commit
50
- (merged to 'next' on 2020-03-15 at a2807c8476)
51
- + t6022, t6046: fix flaky files-are-updated checks
52
-
53
- Test fixes.
54
-
55
-
56
-* es/outside-repo-errmsg-hints (2020-03-15) 1 commit
57
- (merged to 'next' on 2020-03-15 at 12be04a348)
58
- + prefix_path: show gitdir if worktree unavailable
59
-
60
- An earlier update to show the location of working tree in the error
61
- message did not consider the possibility that a git command may be
62
- run in a bare repository, which has been corrected.
63
-
64
-
65
-* jc/doc-single-h-is-for-help (2020-02-27) 1 commit
66
- (merged to 'next' on 2020-03-09 at 9580bb63a2)
67
- + Documentation: clarify that `-h` alone stands for `help`
68
-
69
- Both "git ls-remote -h" and "git grep -h" give short usage help,
70
- like any other Git subcommand, but it is not unreasonable to expect
71
- that the former would behave the same as "git ls-remote --head"
72
- (there is no other sensible behaviour for the latter). The
73
- documentation has been updated in an attempt to clarify this.
74
-
75
---------------------------------------------------
76
-[New Topics]
77
-
78
-* sg/commit-slab-clarify-peek (2020-03-10) 1 commit
79
- (merged to 'next' on 2020-03-11 at 0496b26f23)
80
- + commit-slab: clarify slabname##_peek()'s return value
81
-
82
- In-code comment update.
83
-
84
- Will cook in 'next'.
85
-
86
-
87
-* rs/doc-passthru-fetch-options (2020-03-11) 1 commit
88
- (merged to 'next' on 2020-03-12 at f08dab7228)
89
- + pull: document more passthru options
90
-
91
- Doc update.
92
-
93
- Will cook in 'next'.
94
-
95
-
96
-* bc/filter-process (2020-03-16) 8 commits
97
- - t0021: test filter metadata for additional cases
98
- - builtin/reset: compute checkout metadata for reset
99
- - builtin/rebase: compute checkout metadata for rebases
100
- - builtin/clone: compute checkout metadata for clones
101
- - builtin/checkout: compute checkout metadata for checkouts
102
- - convert: provide additional metadata to filters
103
- - convert: permit passing additional metadata to filter processes
104
- - builtin/checkout: pass branch info down to checkout_worktree
105
-
106
- Provide more information (e.g. the object of the tree-ish in which
107
- the blob being converted appears, in addition to its path, which
108
- has already been given) to smudge/clean conversion filters.
109
-
110
- Will merge to 'next'.
111
-
112
-
113
-* bc/faq (2020-03-15) 1 commit
114
- - docs: add a FAQ
115
-
116
- Doc update.
117
-
118
-
119
-* ds/check-connected-reprepare-packed-git (2020-03-15) 1 commit
120
- (merged to 'next' on 2020-03-16 at 609a322030)
121
- + connected.c: reprepare packs for corner cases
122
-
123
- Corner case "git fetch" fix.
124
-
125
- Will cook in 'next'.
126
-
127
-
128
-* en/oidset-uninclude-hashmap (2020-03-15) 1 commit
129
- (merged to 'next' on 2020-03-16 at a79879866d)
130
- + oidset: remove unnecessary include
131
-
132
- Code clean-up.
133
-
134
- Will cook in 'next'.
135
-
136
-
137
-* jc/log-no-mailmap (2020-03-16) 3 commits
138
- - log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
139
- - clone: reorder --recursive/--recurse-submodules
140
- - parse-options: teach "git cmd -h" to show alias as alias
141
-
142
- "git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"
143
-
24
--------------------------------------------------
25
[Stalled]
26
@@ -222,6 +102,74 @@ of the repositories listed at
102
--------------------------------------------------
103
[Cooking]
104
105
+* sg/commit-slab-clarify-peek (2020-03-10) 1 commit
106
+ (merged to 'next' on 2020-03-11 at 0496b26f23)
107
+ + commit-slab: clarify slabname##_peek()'s return value
108
+
109
+ In-code comment update.
110
+
111
+ Will cook in 'next'.
112
+
113
+
114
+* rs/doc-passthru-fetch-options (2020-03-11) 1 commit
115
+ (merged to 'next' on 2020-03-12 at f08dab7228)
116
+ + pull: document more passthru options
117
+
118
+ Doc update.
119
+
120
+ Will cook in 'next'.
121
+
122
+
123
+* bc/filter-process (2020-03-16) 8 commits
124
+ (merged to 'next' on 2020-03-17 at 2cd9dbf794)
125
+ + t0021: test filter metadata for additional cases
126
+ + builtin/reset: compute checkout metadata for reset
127
+ + builtin/rebase: compute checkout metadata for rebases
128
+ + builtin/clone: compute checkout metadata for clones
129
+ + builtin/checkout: compute checkout metadata for checkouts
130
+ + convert: provide additional metadata to filters
131
+ + convert: permit passing additional metadata to filter processes
132
+ + builtin/checkout: pass branch info down to checkout_worktree
133
+
134
+ Provide more information (e.g. the object of the tree-ish in which
135
+ the blob being converted appears, in addition to its path, which
136
+ has already been given) to smudge/clean conversion filters.
137
+
138
+ Will cook in 'next'.
139
+
140
+
141
+* bc/faq (2020-03-15) 1 commit
142
+ - docs: add a FAQ
143
+
144
+ Doc update.
145
+
146
+
147
+* ds/check-connected-reprepare-packed-git (2020-03-15) 1 commit
148
+ (merged to 'next' on 2020-03-16 at 609a322030)
149
+ + connected.c: reprepare packs for corner cases
150
+
151
+ Corner case "git fetch" fix.
152
+
153
+ Will cook in 'next'.
154
+
155
+
156
+* en/oidset-uninclude-hashmap (2020-03-15) 1 commit
157
+ (merged to 'next' on 2020-03-16 at a79879866d)
158
+ + oidset: remove unnecessary include
159
+
160
+ Code clean-up.
161
+
162
+ Will cook in 'next'.
163
+
164
+
165
+* jc/log-no-mailmap (2020-03-16) 3 commits
166
+ - log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
167
+ - clone: reorder --recursive/--recurse-submodules
168
+ - parse-options: teach "git cmd -h" to show alias as alias
169
+
170
+ "git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"
171
+
172
+
173
* yz/p4-py3 (2020-03-10) 14 commits
174
(merged to 'next' on 2020-03-11 at 01ca57c2b2)
175
+ ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
@@ -245,12 +193,13 @@ of the repositories listed at
193
194
195
* hi/gpg-prefer-check-signature (2020-03-15) 2 commits
248
- - gpg-interface: prefer check_signature() for GPG verification
249
- - t: increase test coverage of signature verification output
196
+ (merged to 'next' on 2020-03-17 at 2def2d9a7e)
197
+ + gpg-interface: prefer check_signature() for GPG verification
198
+ + t: increase test coverage of signature verification output
199
200
The code to interface with GnuPG has been refactored.
201
253
- Will merge to 'next'.
202
+ Will cook in 'next'.
203
204
205
* jc/maintain-doc (2020-03-09) 1 commit
@@ -368,46 +317,48 @@ of the repositories listed at
317
318
319
* pb/recurse-submodules-fix (2020-02-19) 6 commits
371
- - t/lib-submodule-update: add test removing nested submodules
372
- - unpack-trees: check for missing submodule directory in merged_entry
373
- - unpack-trees: remove outdated description for verify_clean_submodule
374
- - t/lib-submodule-update: move a test to the right section
375
- - t/lib-submodule-update: remove outdated test description
376
- - t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED
320
+ (merged to 'next' on 2020-03-17 at b46922ddd1)
321
+ + t/lib-submodule-update: add test removing nested submodules
322
+ + unpack-trees: check for missing submodule directory in merged_entry
323
+ + unpack-trees: remove outdated description for verify_clean_submodule
324
+ + t/lib-submodule-update: move a test to the right section
325
+ + t/lib-submodule-update: remove outdated test description
326
+ + t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED
327
328
Fix "git checkout --recurse-submodules" of a nested submodule
329
hierarchy.
330
381
- Will merge to 'next'.
331
+ Will cook in 'next'.
332
333
334
* bc/sha-256-part-1-of-4 (2020-02-28) 22 commits
385
- - fast-import: add options for rewriting submodules
386
- - fast-import: add a generic function to iterate over marks
387
- - fast-import: make find_marks work on any mark set
388
- - fast-import: add helper function for inserting mark object entries
389
- - fast-import: permit reading multiple marks files
390
- - commit: use expected signature header for SHA-256
391
- - worktree: allow repository version 1
392
- - init-db: move writing repo version into a function
393
- - builtin/init-db: add environment variable for new repo hash
394
- - builtin/init-db: allow specifying hash algorithm on command line
395
- - setup: allow check_repository_format to read repository format
396
- - t/helper: make repository tests hash independent
397
- - t/helper: initialize repository if necessary
398
- - t/helper/test-dump-split-index: initialize git repository
399
- - t6300: make hash algorithm independent
400
- - t6300: abstract away SHA-1-specific constants
401
- - t: use hash-specific lookup tables to define test constants
402
- - repository: require a build flag to use SHA-256
403
- - hex: add functions to parse hex object IDs in any algorithm
404
- - hex: introduce parsing variants taking hash algorithms
405
- - hash: implement and use a context cloning function
406
- - builtin/pack-objects: make hash agnostic
335
+ (merged to 'next' on 2020-03-17 at 436c4e64a7)
336
+ + fast-import: add options for rewriting submodules
337
+ + fast-import: add a generic function to iterate over marks
338
+ + fast-import: make find_marks work on any mark set
339
+ + fast-import: add helper function for inserting mark object entries
340
+ + fast-import: permit reading multiple marks files
341
+ + commit: use expected signature header for SHA-256
342
+ + worktree: allow repository version 1
343
+ + init-db: move writing repo version into a function
344
+ + builtin/init-db: add environment variable for new repo hash
345
+ + builtin/init-db: allow specifying hash algorithm on command line
346
+ + setup: allow check_repository_format to read repository format
347
+ + t/helper: make repository tests hash independent
348
+ + t/helper: initialize repository if necessary
349
+ + t/helper/test-dump-split-index: initialize git repository
350
+ + t6300: make hash algorithm independent
351
+ + t6300: abstract away SHA-1-specific constants
352
+ + t: use hash-specific lookup tables to define test constants
353
+ + repository: require a build flag to use SHA-256
354
+ + hex: add functions to parse hex object IDs in any algorithm
355
+ + hex: introduce parsing variants taking hash algorithms
356
+ + hash: implement and use a context cloning function
357
+ + builtin/pack-objects: make hash agnostic
358
359
SHA-256 transition continues.
360
410
- Will merge to 'next'.
361
+ Will cook in 'next'.
362
363
364
* hw/advise-ng (2020-03-05) 4 commits