What's cooking (2022/06 #08)
Junio C Hamano committed
Jun 27, 2022 at 10:10 UTC
8f2441c521622b8cc3517f0996abce55b072d949
1 file changed
+139
-122
whats-cooking.txt
+139
-122
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2022, #07; Wed, 22)
4
-X-master-at: f770e9f396d48b567ef7b37d273e91ad570a3522
5
-X-next-at: 5c70b8d9af74545ad2b62bd035c293f139c02a5c
3
+Subject: What's cooking in git.git (Jun 2022, #08; Mon, 27)
4
+X-master-at: e4a4b31577c7419497ac30cebe30d755b97752c5
5
+X-next-at: 69fb8171204c8e773da4dd0a0988641096be0b42
6
7
-What's cooking in git.git (Jun 2022, #07; Wed, 22)
7
+What's cooking in git.git (Jun 2022, #08; Mon, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,7 +13,7 @@ topic is stable enough to be used and are candidate to be in a
13
future release). Commits prefixed with '-' are only in 'seen',
14
and aren't considered "accepted" at all.
15
16
-Git 2.37-rc2 has been tagged.
16
+Git 2.37 (final) has been tagged.
17
18
Copies of the source code to Git live in many repositories, and the
19
following is a list of the ones I push into or their mirrors. Some
@@ -43,16 +43,136 @@ Release tarballs are available at:
43
44
https://www.kernel.org/pub/software/scm/git/
45
46
+--------------------------------------------------
47
+[Graduated to 'master']
48
+
49
+* ab/credentials-in-url-more (2022-06-23) 1 commit
50
+ (merged to 'next' on 2022-06-23 at 11d700111c)
51
+ + Documentation/config/transfer.txt: fix typo
52
+
53
+ Typofix.
54
+ source: <68c1c3648c51f6298eea4d58286b20e0c770a270.1656010900.git.me@ttaylorr.com>
55
+
56
+
57
+* jc/revert-show-parent-info (2022-06-27) 1 commit
58
+ (merged to 'next' on 2022-06-27 at 9a7cc59c69)
59
+ + revert: config documentation fixes
60
+
61
+ Typofix.
62
+ source: <6727daf1-f077-7319-187e-ab4e55de3b2d@web.de>
63
+
64
--------------------------------------------------
65
[New Topics]
66
67
+* ab/squelch-empty-fsync-traces (2022-06-23) 1 commit
68
+ - trace2: don't include "fsync" events in all trace2 logs
69
+
70
+ Omit fsync-related trace2 entries when their values are all zero.
71
+
72
+ Expecting a reroll.
73
+ cf. <xmqqh74byy19.fsf@gitster.g>
74
+ source: <patch-1.1-df87e515efd-20220623T154943Z-avarab@gmail.com>
75
+
76
+
77
+* cl/grep-max-count (2022-06-22) 1 commit
78
+ - grep: add --max-count command line option
79
+
80
+ "git grep -m<max-hits>" is a way to limit the hits shown per file.
81
+
82
+ Will merge to 'next'.
83
+ source: <pull.1278.v4.git.git.1655927252899.gitgitgadget@gmail.com>
84
+
85
+
86
+* jk/revisions-doc-markup-fix (2022-06-22) 1 commit
87
+ - revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis
88
+
89
+ Documentation mark-up fix.
90
+
91
+ Will merge to 'next'.
92
+ source: <YrOmsA04FZae89be@coredump.intra.peff.net>
93
+
94
+
95
+* tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit
96
+ - rev-parse: documentation adjustment - mention remote tracking with @{u}
97
+
98
+ Doc update.
99
+
100
+ Will merge to 'next'.
101
+ source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com>
102
+
103
+--------------------------------------------------
104
+[Stalled]
105
+
106
+* bc/stash-export (2022-04-08) 4 commits
107
+ - builtin/stash: provide a way to import stashes from a ref
108
+ - builtin/stash: provide a way to export stashes to a ref
109
+ - builtin/stash: factor out revision parsing into a function
110
+ - object-name: make get_oid quietly return an error
111
+
112
+ A mechanism to export and import stash entries to and from a normal
113
+ commit to transfer it across repositories has been introduced.
114
+
115
+ Expecting a reroll.
116
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
117
+ source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
118
+
119
+
120
+* cw/remote-object-info (2022-05-06) 11 commits
121
+ - SQUASH??? coccicheck
122
+ - SQUASH??? ensure that coccicheck is happy
123
+ - SQUASH??? compilation fix
124
+ - cat-file: add --batch-command remote-object-info command
125
+ - cat-file: move parse_cmd and DEFAULT_FORMAT up
126
+ - transport: add object-info fallback to fetch
127
+ - transport: add client side capability to request object-info
128
+ - object-info: send attribute packet regardless of object ids
129
+ - object-store: add function to free object_info contents
130
+ - fetch-pack: move fetch default settings
131
+ - fetch-pack: refactor packet writing
132
+
133
+ A client component to talk with the object-info endpoint.
134
+
135
+ Expecting a reroll.
136
+ source: <20220502170904.2770649-1-calvinwan@google.com>
137
+
138
+--------------------------------------------------
139
+[Cooking]
140
+
141
+* en/merge-tree (2022-06-22) 17 commits
142
+ - git-merge-tree.txt: add a section on potentional usage mistakes
143
+ - merge-tree: add a --allow-unrelated-histories flag
144
+ - merge-tree: allow `ls-files -u` style info to be NUL terminated
145
+ - merge-ort: optionally produce machine-readable output
146
+ - merge-ort: store more specific conflict information
147
+ - merge-ort: make `path_messages` a strmap to a string_list
148
+ - merge-ort: store messages in a list, not in a single strbuf
149
+ - merge-tree: provide easy access to `ls-files -u` style info
150
+ - merge-tree: provide a list of which files have conflicts
151
+ - merge-ort: remove command-line-centric submodule message from merge-ort
152
+ - merge-ort: provide a merge_get_conflicted_files() helper function
153
+ - merge-tree: support including merge messages in output
154
+ - merge-ort: split out a separate display_update_messages() function
155
+ - merge-tree: implement real merges
156
+ - merge-tree: add option parsing and initial shell for real merge function
157
+ - merge-tree: move logic for existing merge into new function
158
+ - merge-tree: rename merge_trees() to trivial_merge_trees()
159
+
160
+ A new command is introduced that takes two commits and computes a
161
+ tree that would be contained in the resulting merge commit, if the
162
+ histories leading to these two commits were to be merged, and is
163
+ added as a new mode of "git merge-tree" subcommand.
164
+
165
+ Will merge to 'next'.
166
+ source: <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>
167
+
168
+
169
* dr/i18n-die-warn-error-usage (2022-06-21) 1 commit
170
- i18n: mark message helpers prefix for translation
171
172
Give _() markings to fatal/warning/usage: that is shown in front of
173
these messages.
174
55
- Will merge to 'next'?
175
+ Will merge to 'next'.
176
source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@gmail.com>
177
178
@@ -86,7 +206,7 @@ Release tarballs are available at:
206
Certain diff options are currently ignored when combined-diff is
207
shown; mark them as incompatible with the feature.
208
89
- Will merge to 'next'?
209
+ Will merge to 'next'.
210
source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>
211
212
@@ -102,13 +222,14 @@ Release tarballs are available at:
222
source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
223
224
105
-* zh/ls-files-format (2022-06-21) 1 commit
225
+* zh/ls-files-format (2022-06-27) 1 commit
226
- ls-files: introduce "--format" option
227
228
"git ls-files" learns the "--format" option to tweak its output.
229
110
- Needs review.
111
- source: <pull.1262.v3.git.1655777140231.gitgitgadget@gmail.com>
230
+ Expecting a reroll.
231
+ cf. <CAOLTT8Tc95-aUE+uN2d8QjTJpGpGw6cBJfG+bpmyE55OcXTSRA@mail.gmail.com>
232
+ source: <pull.1262.v4.git.1656257376109.gitgitgadget@gmail.com>
233
234
235
* ab/test-quoting-fix (2022-06-21) 3 commits
@@ -134,88 +255,6 @@ Release tarballs are available at:
255
Needs review.
256
source: <pull.1268.git.1655871651.gitgitgadget@gmail.com>
257
137
---------------------------------------------------
138
-[Graduated to 'master']
139
-
140
-* jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits
141
- (merged to 'next' on 2022-06-15 at e580db03e9)
142
- + git-prompt: fix expansion of branch colour codes
143
- (merged to 'next' on 2022-06-08 at 201a84ad63)
144
- + git-prompt: make colourization consistent
145
-
146
- Bash command line prompt (in contrib/) update.
147
- source: <20220607115024.64724-1-joak-pet@online.no>
148
-
149
-
150
-* tb/cruft-packs (2022-06-21) 1 commit
151
- (merged to 'next' on 2022-06-21 at 0703251124)
152
- + gc: simplify --cruft description
153
-
154
- Docfix.
155
- source: <157741e2-cd06-9304-bb21-c67c2cbd923e@web.de>
156
-
157
---------------------------------------------------
158
-[Stalled]
159
-
160
-* en/merge-tree (2022-02-23) 13 commits
161
- - git-merge-tree.txt: add a section on potentional usage mistakes
162
- - merge-tree: add a --allow-unrelated-histories flag
163
- - merge-tree: allow `ls-files -u` style info to be NUL terminated
164
- - merge-tree: provide easy access to `ls-files -u` style info
165
- - merge-tree: provide a list of which files have conflicts
166
- - merge-ort: provide a merge_get_conflicted_files() helper function
167
- - merge-tree: support including merge messages in output
168
- - merge-ort: split out a separate display_update_messages() function
169
- - merge-tree: implement real merges
170
- - merge-tree: add option parsing and initial shell for real merge function
171
- - merge-tree: move logic for existing merge into new function
172
- - merge-tree: rename merge_trees() to trivial_merge_trees()
173
- - Merge branch 'en/remerge-diff' into en/merge-trees
174
-
175
- A new command is introduced that takes two commits and computes a
176
- tree that would be contained in the resulting merge commit, if the
177
- histories leading to these two commits were to be merged, and is
178
- added as a new mode of "git merge-tree" subcommand.
179
-
180
- On hold.
181
- cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>
182
- source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
183
-
184
-
185
-* bc/stash-export (2022-04-08) 4 commits
186
- - builtin/stash: provide a way to import stashes from a ref
187
- - builtin/stash: provide a way to export stashes to a ref
188
- - builtin/stash: factor out revision parsing into a function
189
- - object-name: make get_oid quietly return an error
190
-
191
- A mechanism to export and import stash entries to and from a normal
192
- commit to transfer it across repositories has been introduced.
193
-
194
- Expecting a reroll.
195
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
196
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
197
-
198
-
199
-* cw/remote-object-info (2022-05-06) 11 commits
200
- - SQUASH??? coccicheck
201
- - SQUASH??? ensure that coccicheck is happy
202
- - SQUASH??? compilation fix
203
- - cat-file: add --batch-command remote-object-info command
204
- - cat-file: move parse_cmd and DEFAULT_FORMAT up
205
- - transport: add object-info fallback to fetch
206
- - transport: add client side capability to request object-info
207
- - object-info: send attribute packet regardless of object ids
208
- - object-store: add function to free object_info contents
209
- - fetch-pack: move fetch default settings
210
- - fetch-pack: refactor packet writing
211
-
212
- A client component to talk with the object-info endpoint.
213
-
214
- Expecting a reroll.
215
- source: <20220502170904.2770649-1-calvinwan@google.com>
216
-
217
---------------------------------------------------
218
-[Cooking]
258
259
* cr/setup-bug-typo (2022-06-17) 1 commit
260
(merged to 'next' on 2022-06-17 at 8834ffe0ab)
@@ -235,7 +274,7 @@ Release tarballs are available at:
274
bitmaps. The push.useBitmaps configuration variable is introduced
275
to allow disabling use of reachability bitmaps only for "git push".
276
238
- Will merge to 'next'?
277
+ Will merge to 'next'.
278
source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>
279
280
@@ -246,13 +285,14 @@ Release tarballs are available at:
285
"git remote show [-n] frotz" now pays attention to negative
286
pathspecs.
287
249
- Will merge to 'next'?
288
+ Will merge to 'next'.
289
source: <20220617002036.1577-2-jacob.keller@gmail.com>
290
291
292
* js/commit-graph-parsing-without-repo-settings (2022-06-15) 1 commit
293
- commit-graph: refactor to avoid prepare_repo_settings
294
295
+ Expecting a reroll.
296
source: <9b56496b0809cc8a25af877ea97042e2cb7f2af6.1655246092.git.steadmon@google.com>
297
298
@@ -273,7 +313,7 @@ Release tarballs are available at:
313
"git mktree --missing" lazily fetched objects that are missing from
314
the local object store, which was totally unnecessary.
315
276
- Will merge to 'next'?
316
+ Will merge to 'next'.
317
source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>
318
319
@@ -342,7 +382,7 @@ Release tarballs are available at:
382
source: <20220610195247.1177549-1-jonathantanmy@google.com>
383
384
345
-* gc/submodule-update (2022-06-15) 12 commits
385
+* ab/submodule-cleanup (2022-06-15) 12 commits
386
- git-sh-setup.sh: remove "say" function, change last users
387
- git-submodule.sh: use "$quiet", not "$GIT_QUIET"
388
- submodule--helper: eliminate internal "--update" option
@@ -356,9 +396,9 @@ Release tarballs are available at:
396
- git-submodule.sh: remove unused $prefix var and --super-prefix
397
- git-submodule.sh: remove unused sanitize_submodule_env()
398
359
- More work on "git submodule update".
399
+ Further preparation to turn git-submodule.sh into a builtin.
400
361
- Needs review.
401
+ Will merge to 'next'?
402
source: <cover-v2-00.12-00000000000-20220613T220150Z-avarab@gmail.com>
403
404
@@ -429,7 +469,7 @@ Release tarballs are available at:
469
loose object file straight, without having to keep it in-core as a
470
whole.
471
432
- Will merge to 'next'?
472
+ Will merge to 'next'.
473
source: <cover.1654914555.git.chiyutianyi@gmail.com>
474
475
@@ -525,26 +565,3 @@ Release tarballs are available at:
565
566
Thoughts?
567
source: <20220422083629.1404989-1-hi@alyssa.is>
528
-
529
---------------------------------------------------
530
-[Discarded]
531
-
532
-* jc/apply-icase-tests (2022-06-13) 1 commit
533
- . t4141: test "git apply" with core.ignorecase
534
-
535
- Now a part of tk/apply-case-insensitive topic.
536
- source: <xmqqo7yw77qo.fsf@gitster.g>
537
-
538
-
539
-* tl/pack-bitmap-trace (2022-06-21) 5 commits
540
- . bitmap: add trace2 outputs during open "bitmap" file
541
- . pack-bitmap.c: using error() instead of silently returning -1
542
- . pack-bitmap.c: make warnings support i18N when opening bitmap
543
- . pack-bitmap.c: rename "idx_name" to "bitmap_name"
544
- . pack-bitmap.c: continue looping when first MIDX bitmap is found
545
-
546
- Add trace2 traces in code paths involving the pack bitmaps.
547
-
548
- source: <cover.1655817253.git.dyroneteng@gmail.com>
549
-
550
-