What's cooking (2020/06 #06)
Junio C Hamano committed
Jun 29, 2020 at 17:58 UTC
fff587ab211fc55a36576c13667d128ad2cd30f5
1 file changed
+177
-290
whats-cooking.txt
+177
-290
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2020, #05; Thu, 25)
4
-X-master-at: f402ea68166bd77f09b176c96005ac7f8886e14b
5
-X-next-at: b9a2d1a0207fb9ded3fa524f54db3bc322a12cc4
3
+Subject: What's cooking in git.git (Jun 2020, #06; Mon, 29)
4
+X-master-at: a08a83db2bf27f015bec9a435f6d73e223c21c5e
5
+X-next-at: 050319c2ae82f2fac00eac9d80a1d91394d99aec
6
7
-What's cooking in git.git (Jun 2020, #05; Thu, 25)
7
+What's cooking in git.git (Jun 2020, #06; Mon, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,8 +12,11 @@ only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
12
with '+' 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
-A handful of topics have graduated to 'master' and a bunch of topics
16
-have been merged to 'next'.
15
+More topics graduate to the 'master' and to the 'next' branches. I
16
+expect that this week would be slower than usual due to US holidays
17
+but hopefully we'd be able to merge most of the impactful topics by
18
+the -rc0. Some large-ish topics may have to be left for the next
19
+cycle, as usual.
20
21
You can find the changes described here in the integration branches of the
22
repositories listed at
@@ -23,127 +26,119 @@ repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
26
-* cc/upload-pack-data-3 (2020-06-11) 14 commits
27
- (merged to 'next' on 2020-06-17 at 393eff577a)
28
- + upload-pack: refactor common code into do_got_oid()
29
- + upload-pack: move oldest_have to upload_pack_data
30
- + upload-pack: pass upload_pack_data to got_oid()
31
- + upload-pack: pass upload_pack_data to ok_to_give_up()
32
- + upload-pack: pass upload_pack_data to send_acks()
33
- + upload-pack: pass upload_pack_data to process_haves()
34
- + upload-pack: change allow_unadvertised_object_request to an enum
35
- + upload-pack: move allow_unadvertised_object_request to upload_pack_data
36
- + upload-pack: move extra_edge_obj to upload_pack_data
37
- + upload-pack: move shallow_nr to upload_pack_data
38
- + upload-pack: pass upload_pack_data to send_unshallow()
39
- + upload-pack: pass upload_pack_data to deepen_by_rev_list()
40
- + upload-pack: pass upload_pack_data to deepen()
41
- + upload-pack: pass upload_pack_data to send_shallow_list()
42
-
43
- Code clean-up in the codepath that serves "git fetch" continues.
44
-
45
-
46
-* ct/diff-with-merge-base-clarification (2020-06-12) 3 commits
47
- (merged to 'next' on 2020-06-17 at e0b54a001c)
48
- + Documentation: usage for diff combined commits
49
- + git diff: improve range handling
50
- + t/t3430: avoid undefined git diff behavior
51
-
52
- "git diff" used to take arguments in random and nonsense range
53
- notation, e.g. "git diff A..B C", "git diff A..B C...D", etc.,
54
- which has been cleaned up.
55
-
56
-
57
-* dl/branch-cleanup (2020-06-17) 3 commits
58
- (merged to 'next' on 2020-06-18 at 76e151342c)
59
- + branch: don't mix --edit-description
60
- + t3200: test for specific errors
61
- + t3200: rename "expected" to "expect"
62
-
63
- Code clean-up around "git branch" with a minor bugfix.
64
-
65
-
66
-* ds/merge-base-is-ancestor-optim (2020-06-17) 2 commits
67
- (merged to 'next' on 2020-06-18 at 86b34a3688)
68
- + commit-reach: use fast logic in repo_in_merge_base
69
- + commit-reach: create repo_is_descendant_of()
70
- (this branch is used by cb/is-descendant-of.)
71
-
72
- "git merge-base --is-ancestor" is taught to take advantage of the
73
- commit graph.
74
-
75
-
76
-* en/clean-cleanups (2020-06-12) 4 commits
77
- (merged to 'next' on 2020-06-17 at 2c4ec990a6)
78
- + clean: optimize and document cases where we recurse into subdirectories
79
- + clean: consolidate handling of ignored parameters
80
- + dir, clean: avoid disallowed behavior
81
- + dir: fix a few confusing comments
82
-
83
- Code clean-up of "git clean" resulted in a fix of recent
84
- performance regression.
85
-
86
-
87
-* jk/complete-git-switch (2020-05-28) 16 commits
88
- (merged to 'next' on 2020-06-17 at 5b31140c0a)
89
- + completion: improve handling of --orphan option of switch/checkout
90
- + completion: improve handling of -c/-C and -b/-B in switch/checkout
91
- + completion: improve handling of --track in switch/checkout
92
- + completion: improve handling of --detach in checkout
93
- + completion: improve completion for git switch with no options
94
- + completion: improve handling of DWIM mode for switch/checkout
95
- + completion: perform DWIM logic directly in __git_complete_refs
96
- + completion: extract function __git_dwim_remote_heads
97
- + completion: replace overloaded track term for __git_complete_refs
98
- + completion: add tests showing subpar switch/checkout --orphan logic
99
- + completion: add tests showing subpar -c/C argument completion
100
- + completion: add tests showing subpar -c/-C startpoint completion
101
- + completion: add tests showing subpar switch/checkout --track logic
102
- + completion: add tests showing subar checkout --detach logic
103
- + completion: add tests showing subpar DWIM logic for switch/checkout
104
- + completion: add test showing subpar git switch completion
105
-
106
- The command line completion (in contrib/) learned to complete
107
- options that the "git switch" command takes.
108
-
109
-
110
-* jt/cdn-offload (2020-06-17) 10 commits
111
- (merged to 'next' on 2020-06-18 at e8ba1cc988)
112
- + upload-pack: fix a sparse '0 as NULL pointer' warning
113
- + upload-pack: send part of packfile response as uri
114
- + fetch-pack: support more than one pack lockfile
115
- + upload-pack: refactor reading of pack-objects out
116
- + Documentation: add Packfile URIs design doc
117
- + Documentation: order protocol v2 sections
118
- + http-fetch: support fetching packfiles by URL
119
- + http-fetch: refactor into function
120
- + http: refactor finish_http_pack_request()
121
- + http: use --stdin when indexing dumb HTTP pack
122
-
123
- The "fetch/clone" protocol has been updated to allow the server to
124
- instruct the clients to grab pre-packaged packfile(s) in addition
125
- to the packed object data coming over the wire.
126
-
127
-
128
-* pb/t4014-unslave (2020-06-19) 1 commit
129
- (merged to 'next' on 2020-06-19 at 4d328a12d9)
130
- + t4014: do not use "slave branch" nomenclature
131
-
132
- A branch name used in a test has been clarified to match what is
133
- going on.
134
-
135
-
136
-* ss/submodule-set-branch-in-c (2020-06-02) 1 commit
137
- (merged to 'next' on 2020-06-18 at 8880b35c5a)
138
- + submodule: port subcommand 'set-branch' from shell to C
29
+* dl/diff-usage-comment-update (2020-06-23) 2 commits
30
+ (merged to 'next' on 2020-06-23 at 48d685cd45)
31
+ + builtin/diff: fix botched update of usage comment
32
+ (merged to 'next' on 2020-06-19 at b53a12bb66)
33
+ + builtin/diff: update usage comment
34
+
35
+ An in-code comment in "git diff" has been updated.
36
+
37
+
38
+* rs/commit-reach-leakfix (2020-06-19) 1 commit
39
+ (merged to 'next' on 2020-06-22 at fcc1e385f0)
40
+ + commit-reach: plug minor memory leak after using is_descendant_of()
41
+
42
+ Leakfix.
43
+
44
+
45
+* rs/pull-leakfix (2020-06-19) 1 commit
46
+ (merged to 'next' on 2020-06-22 at d80a6b9ca3)
47
+ + pull: plug minor memory leak after using is_descendant_of()
48
+
49
+ Leakfix.
50
+
51
+
52
+* rs/retire-strbuf-write-fd (2020-06-19) 2 commits
53
+ (merged to 'next' on 2020-06-22 at c175b54f2a)
54
+ + strbuf: remove unreferenced strbuf_write_fd method.
55
+ + bugreport.c: replace strbuf_write_fd with write_in_full
56
+
57
+ A misdesigned strbuf_write_fd() function has been retired.
58
+
59
+
60
+* sk/diff-files-show-i-t-a-as-new (2020-06-22) 1 commit
61
+ (merged to 'next' on 2020-06-22 at 825a823416)
62
+ + diff-files: treat "i-t-a" files as "not-in-index"
63
+ (this branch is used by js/diff-files-i-t-a-fix-for-difftool.)
64
+
65
+ "git diff-files" has been taught to say paths that are marked as
66
+ intent-to-add are new files, not modified from an empty blob.
67
+
68
+
69
+* xl/upgrade-repo-format (2020-06-05) 4 commits
70
+ (merged to 'next' on 2020-06-19 at 02bf7a9d8c)
71
+ + check_repository_format_gently(): refuse extensions for old repositories
72
+ + sparse-checkout: upgrade repository to version 1 when enabling extension
73
+ + fetch: allow adding a filter after initial clone
74
+ + repository: add a helper function to perform repository format upgrade
75
+
76
+ Allow runtime upgrade of the repository format version, which needs
77
+ to be done carefully.
78
140
- Rewrite of parts of the scripted "git submodule" Porcelain command
141
- continues; this time it is "git submodule set-branch" subcommand's
142
- turn.
79
+ There is a rather unpleasant backward compatibility worry with the
80
+ last step of this series, but it is the right thing to do in the
81
+ longer term.
82
83
--------------------------------------------------
84
[New Topics]
85
86
+* mt/hash-to-hex-thread-safety (2020-06-26) 2 commits
87
+ - hex: make hash_to_hex_algop() and friends thread-safe
88
+ - compat/win32/pthread: add pthread_once()
89
+
90
+ hash_to_hex() used a set of rotating static buffers, which was not
91
+ safe to use in a threaded environment. This has been made safer by
92
+ using thread-local storage.
93
+
94
+ Will merge to 'next'.
95
+
96
+--------------------------------------------------
97
+[Stalled]
98
+
99
+* dr/push-remoteref-fix (2020-04-23) 1 commit
100
+ - remote.c: fix handling of %(push:remoteref)
101
+
102
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
103
+ "git format-patch" (and friends) only showed what got explicitly
104
+ configured, not what ref at the receiving end would be updated when
105
+ "git push" was used, as it ignored the default behaviour (e.g. update
106
+ the same ref as the source).
107
+
108
+ Expecting a reroll.
109
+ cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
110
+
111
+
112
+* mr/bisect-in-c-2 (2020-04-23) 12 commits
113
+ - bisect--helper: retire `--bisect-autostart` subcommand
114
+ - bisect--helper: retire `--write-terms` subcommand
115
+ - bisect--helper: retire `--check-expected-revs` subcommand
116
+ - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
117
+ - bisect--helper: retire `--next-all` subcommand
118
+ - bisect--helper: retire `--bisect-clean-state` subcommand
119
+ - bisect--helper: finish porting `bisect_start()` to C
120
+ - bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
121
+ - bisect--helper: reimplement `bisect_autostart` shell function in C
122
+ - bisect--helper: introduce new `write_in_file()` function
123
+ - bisect--helper: use '-res' in 'cmd_bisect__helper' return
124
+ - bisect--helper: fix `cmd_*()` function switch default return
125
+
126
+ Rewrite of the remainder of "git bisect" script in C continues.
127
+
128
+ Expecting a response to reviews.
129
+ cf. <nycvar.QRO.7.76.6.2005230007260.56@tvgsbejvaqbjf.bet>
130
+
131
+
132
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
133
+ - zlib.c: use size_t for size
134
+
135
+ The wrapper to call into zlib followed our long tradition to use
136
+ "unsigned long" for sizes of regions in memory, which have been
137
+ updated to use "size_t".
138
+
139
+--------------------------------------------------
140
+[Cooking]
141
+
142
* bc/http-push-flagsfix (2020-06-23) 1 commit
143
(merged to 'next' on 2020-06-25 at 1dabb1f61b)
144
+ http-push: ensure unforced pushes fail when data would be lost
@@ -165,33 +160,34 @@ repositories listed at
160
161
162
* jk/fast-export-anonym-alt (2020-06-25) 11 commits
168
- - fast-export: use local array to store anonymized oid
169
- - fast-export: anonymize "master" refname
170
- - fast-export: allow seeding the anonymized mapping
171
- - fast-export: add a "data" callback parameter to anonymize_str()
172
- - fast-export: move global "idents" anonymize hashmap into function
173
- - fast-export: use a flex array to store anonymized entries
174
- - fast-export: stop storing lengths in anonymized hashmaps
175
- - fast-export: tighten anonymize_mem() interface to handle only strings
176
- - fast-export: store anonymized oids as hex strings
177
- - fast-export: use xmemdupz() for anonymizing oids
178
- - t9351: derive anonymized tree checks from original repo
163
+ (merged to 'next' on 2020-06-29 at 8a8d83e2ca)
164
+ + fast-export: use local array to store anonymized oid
165
+ + fast-export: anonymize "master" refname
166
+ + fast-export: allow seeding the anonymized mapping
167
+ + fast-export: add a "data" callback parameter to anonymize_str()
168
+ + fast-export: move global "idents" anonymize hashmap into function
169
+ + fast-export: use a flex array to store anonymized entries
170
+ + fast-export: stop storing lengths in anonymized hashmaps
171
+ + fast-export: tighten anonymize_mem() interface to handle only strings
172
+ + fast-export: store anonymized oids as hex strings
173
+ + fast-export: use xmemdupz() for anonymizing oids
174
+ + t9351: derive anonymized tree checks from original repo
175
176
"git fast-export --anonymize" learned to take customized mapping to
177
allow its users to tweak its output more usable for debugging.
178
183
- Will merge to 'next'.
179
+ Will merge to 'master'.
180
181
182
* js/diff-files-i-t-a-fix-for-difftool (2020-06-25) 2 commits
187
- - difftool -d: ensure that intent-to-add files are handled correctly
188
- - diff-files --raw: show correct post-image of intent-to-add files
189
- (this branch uses sk/diff-files-show-i-t-a-as-new.)
183
+ (merged to 'next' on 2020-06-29 at a9fcdabb3b)
184
+ + difftool -d: ensure that intent-to-add files are handled correctly
185
+ + diff-files --raw: show correct post-image of intent-to-add files
186
187
"git difftool" has trouble dealing with paths added to the index
188
with the intent-to-add bit.
189
194
- Will merge to 'next'.
190
+ Will merge to 'master'.
191
192
193
* js/pu-to-seen (2020-06-25) 3 commits
@@ -237,14 +233,15 @@ repositories listed at
233
234
235
* es/worktree-code-cleanup (2020-06-24) 1 commit
240
- - worktree: avoid dead-code in conditional
236
+ (merged to 'next' on 2020-06-29 at 91ffd85a31)
237
+ + worktree: avoid dead-code in conditional
238
239
Code cleanup.
240
244
- Will merge to 'next'.
241
+ Will merge to 'master'.
242
243
247
-* ra/send-email-in-reply-to-from-command-line-wins (2020-06-24) 1 commit
244
+* ra/send-email-in-reply-to-from-command-line-wins (2020-06-29) 1 commit
245
- send-email: restore --in-reply-to superseding behavior
246
247
"git send-email --in-reply-to=<msg>" did not use the In-Reply-To:
@@ -255,51 +252,6 @@ repositories listed at
252
Expecting a reroll/redesign.
253
Does not behave sensibly for a multi-patch series.
254
258
---------------------------------------------------
259
-[Stalled]
260
-
261
-* dr/push-remoteref-fix (2020-04-23) 1 commit
262
- - remote.c: fix handling of %(push:remoteref)
263
-
264
- The "%(push:remoteref)" placeholder in the "--format=" argument of
265
- "git format-patch" (and friends) only showed what got explicitly
266
- configured, not what ref at the receiving end would be updated when
267
- "git push" was used, as it ignored the default behaviour (e.g. update
268
- the same ref as the source).
269
-
270
- Expecting a reroll.
271
- cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
272
-
273
-
274
-* mr/bisect-in-c-2 (2020-04-23) 12 commits
275
- - bisect--helper: retire `--bisect-autostart` subcommand
276
- - bisect--helper: retire `--write-terms` subcommand
277
- - bisect--helper: retire `--check-expected-revs` subcommand
278
- - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
279
- - bisect--helper: retire `--next-all` subcommand
280
- - bisect--helper: retire `--bisect-clean-state` subcommand
281
- - bisect--helper: finish porting `bisect_start()` to C
282
- - bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
283
- - bisect--helper: reimplement `bisect_autostart` shell function in C
284
- - bisect--helper: introduce new `write_in_file()` function
285
- - bisect--helper: use '-res' in 'cmd_bisect__helper' return
286
- - bisect--helper: fix `cmd_*()` function switch default return
287
-
288
- Rewrite of the remainder of "git bisect" script in C continues.
289
-
290
- Expecting a response to reviews.
291
- cf. <nycvar.QRO.7.76.6.2005230007260.56@tvgsbejvaqbjf.bet>
292
-
293
-
294
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
295
- - zlib.c: use size_t for size
296
-
297
- The wrapper to call into zlib followed our long tradition to use
298
- "unsigned long" for sizes of regions in memory, which have been
299
- updated to use "size_t".
300
-
301
---------------------------------------------------
302
-[Cooking]
255
256
* en/sparse-status (2020-06-22) 3 commits
257
(merged to 'next' on 2020-06-25 at 404403a075)
@@ -312,17 +264,6 @@ repositories listed at
264
Will merge to 'master'.
265
266
315
-* dl/diff-usage-comment-update (2020-06-23) 2 commits
316
- (merged to 'next' on 2020-06-23 at 48d685cd45)
317
- + builtin/diff: fix botched update of usage comment
318
- (merged to 'next' on 2020-06-19 at b53a12bb66)
319
- + builtin/diff: update usage comment
320
-
321
- An in-code comment in "git diff" has been updated.
322
-
323
- Will merge to 'master'.
324
-
325
-
267
* ps/ref-transaction-hook (2020-06-19) 1 commit
268
(merged to 'next' on 2020-06-22 at 3a23dcdbdc)
269
+ refs: implement reference transaction hook
@@ -332,58 +273,6 @@ repositories listed at
273
Will merge to 'master'.
274
275
335
-* sk/diff-files-show-i-t-a-as-new (2020-06-22) 1 commit
336
- (merged to 'next' on 2020-06-22 at 825a823416)
337
- + diff-files: treat "i-t-a" files as "not-in-index"
338
- (this branch is used by js/diff-files-i-t-a-fix-for-difftool.)
339
-
340
- "git diff-files" has been taught to say paths that are marked as
341
- intent-to-add are new files, not modified from an empty blob.
342
-
343
- Will merge to 'master'.
344
-
345
-
346
-* jk/fast-export-anonym (2020-06-22) 4 commits
347
- (merged to 'next' on 2020-06-22 at b517b2f707)
348
- + fast-export: allow dumping the path mapping
349
- + fast-export: refactor path printing to not rely on stdout
350
- + fast-export: anonymize "master" refname
351
- + fast-export: allow dumping the refname mapping
352
-
353
- The way refnames are anonymized has been updated and a way to help
354
- debugging using the anonymized output hsa been added.
355
-
356
- Will merge to 'master'.
357
-
358
-
359
-* rs/commit-reach-leakfix (2020-06-19) 1 commit
360
- (merged to 'next' on 2020-06-22 at fcc1e385f0)
361
- + commit-reach: plug minor memory leak after using is_descendant_of()
362
-
363
- Leakfix.
364
-
365
- Will merge to 'master'.
366
-
367
-
368
-* rs/pull-leakfix (2020-06-19) 1 commit
369
- (merged to 'next' on 2020-06-22 at d80a6b9ca3)
370
- + pull: plug minor memory leak after using is_descendant_of()
371
-
372
- Leakfix.
373
-
374
- Will merge to 'master'.
375
-
376
-
377
-* rs/retire-strbuf-write-fd (2020-06-19) 2 commits
378
- (merged to 'next' on 2020-06-22 at c175b54f2a)
379
- + strbuf: remove unreferenced strbuf_write_fd method.
380
- + bugreport.c: replace strbuf_write_fd with write_in_full
381
-
382
- A misdesigned strbuf_write_fd() function has been retired.
383
-
384
- Will merge to 'master'.
385
-
386
-
276
* bc/sha-256-cvs-svn-updates (2020-06-22) 14 commits
277
(merged to 'next' on 2020-06-25 at e0d1c87fcf)
278
+ git-cvsexportcommit: port to SHA-256
@@ -400,15 +289,14 @@ repositories listed at
289
+ t9108: make test hash independent
290
+ t9168: make test hash independent
291
+ t9109: make test hash independent
403
- (this branch uses bc/sha-256-part-2.)
292
+ (this branch uses bc/sha-256-part-2; is tangled with hn/reftable.)
293
294
CVS/SVN interface have been prepared for SHA-256 transition
295
296
Will merge to 'master'.
297
298
410
-* ds/commit-graph-bloom-updates (2020-06-23) 11 commits
411
- - bloom: enforce a minimum size of 8 bytes
299
+* ds/commit-graph-bloom-updates (2020-06-26) 10 commits
300
- commit-graph: check all leading directories in changed path Bloom filters
301
- revision: empty pathspecs should not use Bloom filters
302
- revision.c: fix whitespace
@@ -416,15 +304,14 @@ repositories listed at
304
- commit-graph: simplify chunk writes into loop
305
- commit-graph: unify the signatures of all write_graph_chunk_*() functions
306
- commit-graph: persist existence of changed-paths
419
- - bloom: get_bloom_filter() cleanups
307
+ - bloom: fix logic in get_bloom_filter()
308
- commit-graph: change test to die on parse, not load
309
- commit-graph: place bloom_settings in context
310
(this branch uses sg/commit-graph-cleanups.)
311
312
Updates to the changed-paths bloom filter.
313
426
- Expecting a reroll. Saw a lot of good review exchanges.
427
- cf. <4b08360d-04ab-b614-196b-76124f1d54ef@gmail.com>
314
+ Will merge to 'next'.
315
316
317
* es/get-worktrees-unsort (2020-06-22) 2 commits
@@ -458,6 +345,7 @@ repositories listed at
345
+ submodule: fall back to remote's HEAD for missing remote.<name>.branch
346
+ send-pack/transport-helper: avoid mentioning a particular branch
347
+ fmt-merge-msg: stop treating `master` specially
348
+ (this branch is used by hn/reftable.)
349
350
The name of the primary branch in existing repositories, and the
351
default name used for the first branch in newly created
@@ -467,7 +355,7 @@ repositories listed at
355
Will merge to 'master'.
356
357
470
-* ss/cmake-build (2020-06-12) 8 commits
358
+* ss/cmake-build (2020-06-26) 8 commits
359
- ci: modification of main.yml to use cmake for vs-build job
360
- cmake: support for building git on windows with msvc and clang.
361
- cmake: support for building git on windows with mingw
@@ -479,8 +367,7 @@ repositories listed at
367
368
CMake support to build with MSVC for Windows bypassing the Makefile.
369
482
- Expecting a reroll.
483
- Almost there.
370
+ Waiting for a (hopefully final) review.
371
372
373
* ak/commit-graph-to-slab (2020-06-17) 4 commits
@@ -497,14 +384,15 @@ repositories listed at
384
385
386
* dl/test-must-fail-fixes-5 (2020-06-24) 4 commits
500
- - lib-submodule-update: pass 'test_must_fail' as an argument
501
- - lib-submodule-update: prepend "git" to $command
502
- - lib-submodule-update: consolidate --recurse-submodules
503
- - lib-submodule-update: add space after function name
387
+ (merged to 'next' on 2020-06-29 at efe53a7588)
388
+ + lib-submodule-update: pass 'test_must_fail' as an argument
389
+ + lib-submodule-update: prepend "git" to $command
390
+ + lib-submodule-update: consolidate --recurse-submodules
391
+ + lib-submodule-update: add space after function name
392
393
The effort to avoid using test_must_fail on non-git command continues.
394
507
- Will merge to 'next'.
395
+ Will merge to 'master'.
396
397
398
* sg/commit-graph-cleanups (2020-06-08) 10 commits
@@ -523,24 +411,10 @@ repositories listed at
411
The changed-path Bloom filter is improved using ideas from an
412
independent implementation.
413
526
- Will merge to 'next'.
527
-
528
-
529
-* xl/upgrade-repo-format (2020-06-05) 4 commits
530
- (merged to 'next' on 2020-06-19 at 02bf7a9d8c)
531
- + check_repository_format_gently(): refuse extensions for old repositories
532
- + sparse-checkout: upgrade repository to version 1 when enabling extension
533
- + fetch: allow adding a filter after initial clone
534
- + repository: add a helper function to perform repository format upgrade
535
-
536
- Allow runtime upgrade of the repository format version, which needs
537
- to be done carefully.
538
-
539
- There is a rather unpleasant backward compatibility worry with the
540
- last step of this series, but it is the right thing to do in the
541
- longer term.
542
-
543
- Will merge to 'master'.
414
+ Under review.
415
+ cf. <20200627155610.GN2898@szeder.dev>
416
+ cf. <20200627163335.GO2898@szeder.dev>
417
+ cf. <20200627155348.GM2898@szeder.dev>
418
419
420
* es/config-hooks (2020-05-21) 4 commits
@@ -554,7 +428,7 @@ repositories listed at
428
What's the status of this one? Abandoned?
429
430
557
-* pw/rebase-i-more-options (2020-05-27) 5 commits
431
+* pw/rebase-i-more-options (2020-06-26) 5 commits
432
- rebase: add --reset-author-date
433
- rebase -i: support --ignore-date
434
- sequencer: rename amend_author to author_to_free
@@ -563,8 +437,7 @@ repositories listed at
437
438
"git rebase -i" learns a bit more options.
439
566
- Expecting a reroll.
567
- cf. <nycvar.QRO.7.76.6.2005290437350.56@tvgsbejvaqbjf.bet>
440
+ Waiting for a (hopefully final) review.
441
442
443
* mt/grep-sparse-checkout (2020-06-12) 6 commits
@@ -628,7 +501,7 @@ repositories listed at
501
+ connect: have ref processing code take struct packet_reader
502
+ Documentation: document v1 protocol object-format capability
503
+ t1050: match object ID paths in a hash-insensitive way
631
- (this branch is used by bc/sha-256-cvs-svn-updates.)
504
+ (this branch is used by bc/sha-256-cvs-svn-updates and hn/reftable.)
505
506
SHA-256 migration work continues.
507
@@ -654,8 +527,8 @@ repositories listed at
527
Needs review.
528
529
657
-* hn/reftable (2020-06-22) 20 commits
658
- - SQUASH??? fix new blank line at EOF
530
+* hn/reftable (2020-06-29) 23 commits
531
+ - fixup! Reftable support for git-core
532
- Add "test-tool dump-reftable" command.
533
- Add reftable testing infrastructure
534
- git-prompt: prepare for reftable refs backend
@@ -674,16 +547,17 @@ repositories listed at
547
- Make refs_ref_exists public
548
- Write pseudorefs through ref backends.
549
- checkout: add '\n' to reflog message
550
+ - t3432: use git-reflog to inspect the reflog for HEAD
551
- lib-t6000.sh: write tag using git-update-ref
552
+ - Merge branch 'bc/sha-256-part-2' into HEAD
553
+ - Merge branch 'js/default-branch-name' into HEAD
554
+ (this branch uses bc/sha-256-part-2 and js/default-branch-name; is tangled with bc/sha-256-cvs-svn-updates.)
555
556
A new refs backend "reftable" to replace the traditional
557
combination of packed-refs files and one-file-per-ref loose refs
558
has been implemented and integrated for improved performance and
559
atomicity.
560
684
- Does not seem to play well with the xl/upgrade-repo-format topic;
685
- perhaps rework on top of 'master' after that topic graduates?
686
-
561
--------------------------------------------------
562
[Discarded]
563
@@ -712,3 +586,16 @@ repositories listed at
586
and specific names are updated, and also a pull request.
587
588
Superseded by jk/ci-only-on-selected-branches
589
+
590
+
591
+* jk/fast-export-anonym (2020-06-22) 4 commits
592
+ (merged to 'next' on 2020-06-22 at b517b2f707)
593
+ + fast-export: allow dumping the path mapping
594
+ + fast-export: refactor path printing to not rely on stdout
595
+ + fast-export: anonymize "master" refname
596
+ + fast-export: allow dumping the refname mapping
597
+
598
+ The way refnames are anonymized has been updated and a way to help
599
+ debugging using the anonymized output hsa been added.
600
+
601
+ Superseded by 'jk/fast-export-anonym-alt'.