What's cooking (2020/06 #02)
Junio C Hamano committed
Jun 10, 2020 at 16:35 UTC
210b27a8a325027b35ec45ab52201e21a12df8de
1 file changed
+247
-272
whats-cooking.txt
+247
-272
@@ -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, #01; Wed, 3)
4
-X-master-at: 20514004ddf1a3528de8933bc32f284e175e1012
5
-X-next-at: ba653c62daa4884fe39d46cecbbcf7d8c13e7b61
3
+Subject: What's cooking in git.git (Jun 2020, #02; Wed, 10)
4
+X-master-at: 0313f36c6ebecb3bffe6f15cf25a4883100f0214
5
+X-next-at: abb59f83a216876869f6c88d32485dc740ada78d
6
7
-What's cooking in git.git (Jun 2020, #01; Wed, 3)
7
+What's cooking in git.git (Jun 2020, #02; Wed, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,27 +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
-Git 2.27 has been tagged, and the first batch of topics (including
16
-the "throw protocol v2 to the experimental group of features" thing)
17
-have been merged to the 'master' branch. I'm planning to rewind the
18
-tip of 'next' in a not-so-distant future.
19
-
20
-Seeing a handful of regression reports [*] immediately after a
21
-feature release is made gives me a mixed feeling: people are eager
22
-enough to help by reporting issues they encounter, but there are not
23
-enough people who are eager enough to help by testing the tip of
24
-'master' before the release. Are there things we can do to help
25
-them become early adopters so that they do not have to scramble
26
-after the release?
27
-
28
- * sparse-checkout
29
- cf. <CAD3+_6CUX0RPr-dgfUnfGDNNfqu80SYCskioYnu=MS6aJv2dEQ@mail.gmail.com>
30
-
31
- * untracked with pathspec
32
- cf. <CAJmdR_pG74x0Zn43MSm7zXNcoitqjjOy+WnhyGBW+oFjVFLbRQ@mail.gmail.com>
33
-
34
- * shallow point adjustment
35
- cf. <20200603034213.GB253041@google.com>
15
+The tip of 'next' has been rewound and rebuilt.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -42,118 +22,243 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
45
-* an/merge-single-strategy-optim (2020-05-19) 1 commit
46
- (merged to 'next' on 2020-05-20 at 8d5cacc8d1)
47
- + merge: optimization to skip evaluate_result for single strategy
25
+* bc/filter-process (2020-05-21) 2 commits
26
+ (merged to 'next' on 2020-05-24 at 3d51328096)
27
+ + t2060: add a test for switch with --orphan and --discard-changes
28
+ + builtin/checkout: simplify metadata initialization
29
+
30
+ Code simplification and test coverage enhancement.
31
+
32
49
- Code optimization for a common case.
33
+* cb/bisect-helper-parser-fix (2020-05-24) 1 commit
34
+ (merged to 'next' on 2020-05-24 at d30e10fa86)
35
+ + bisect--helper: avoid segfault with bad syntax in `start --term-*`
36
+
37
+ The code to parse "git bisect start" command line was lax in
38
+ validating the arguments.
39
40
52
-* bk/p4-prepare-p4-only-fix (2020-05-12) 1 commit
53
- (merged to 'next' on 2020-05-24 at c1b4644b04)
54
- + git-p4.py: fix --prepare-p4-only error with multiple commits
41
+* cb/t4210-illseq-auto-detect (2020-05-18) 2 commits
42
+ (merged to 'next' on 2020-05-24 at c03b4095fa)
43
+ + t4210: detect REG_ILLSEQ dynamically and skip affected tests
44
+ + t/helper: teach test-regex to report pattern errors (like REG_ILLSEQ)
45
+
46
+ As FreeBSD is not the only platform whose regexp library reports
47
+ a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that
48
+ automatically and skip the affected tests.
49
+
50
+
51
+* cc/upload-pack-data (2020-05-18) 13 commits
52
+ (merged to 'next' on 2020-05-29 at 66008d9209)
53
+ + upload-pack: use upload_pack_data fields in receive_needs()
54
+ + upload-pack: pass upload_pack_data to create_pack_file()
55
+ + upload-pack: remove static variable 'stateless_rpc'
56
+ + upload-pack: pass upload_pack_data to check_non_tip()
57
+ + upload-pack: pass upload_pack_data to send_ref()
58
+ + upload-pack: move symref to upload_pack_data
59
+ + upload-pack: use upload_pack_data writer in receive_needs()
60
+ + upload-pack: pass upload_pack_data to receive_needs()
61
+ + upload-pack: pass upload_pack_data to get_common_commits()
62
+ + upload-pack: use 'struct upload_pack_data' in upload_pack()
63
+ + upload-pack: move 'struct upload_pack_data' around
64
+ + upload-pack: move {want,have}_obj to upload_pack_data
65
+ + upload-pack: remove unused 'wants' from upload_pack_data
66
+ (this branch is used by cc/upload-pack-data-2.)
67
56
- The "--prepare-p4-only" option is supposed to stop after replaying
57
- one changeset, but kept going (by mistake?)
58
- cf. <CAE5ih797YYxsR2H0TA65w9W-1jF4jQLayja_nGjQMGtc=PB6Jw@mail.gmail.com>
68
+ Code clean-up.
69
70
61
-* cb/t5608-cleanup (2020-05-24) 1 commit
62
- (merged to 'next' on 2020-05-24 at 2bfa581890)
63
- + t5608: avoid say() and use "skip_all" instead for consistency
71
+* dl/remote-curl-deadlock-fix (2020-05-24) 7 commits
72
+ (merged to 'next' on 2020-05-26 at 072714ca7f)
73
+ + stateless-connect: send response end packet
74
+ + pkt-line: define PACKET_READ_RESPONSE_END
75
+ + remote-curl: error on incomplete packet
76
+ + pkt-line: extern packet_length()
77
+ + transport: extract common fetch_pack() call
78
+ + remote-curl: remove label indentation
79
+ + remote-curl: fix typo
80
65
- Test fixup.
81
+ On-the-wire protocol v2 easily falls into a deadlock between the
82
+ remote-curl helper and the fetch-pack process when the server side
83
+ prematurely throws an error and disconnects. The communication has
84
+ been updated to make it more robust.
85
86
68
-* en/fast-import-looser-date (2020-05-31) 1 commit
69
- (merged to 'next' on 2020-05-31 at 49de9c07c5)
70
- + fast-import: add new --date-format=raw-permissive format
87
+* ds/line-log-on-bloom (2020-05-11) 5 commits
88
+ (merged to 'next' on 2020-05-11 at 046d49d455)
89
+ + line-log: integrate with changed-path Bloom filters
90
+ + line-log: try to use generation number-based topo-ordering
91
+ + line-log: more responsive, incremental 'git log -L'
92
+ + t4211-line-log: add tests for parent oids
93
+ + line-log: remove unused fields from 'struct line_log_data'
94
+ (this branch is used by sg/commit-graph-cleanups.)
95
72
- Some repositories in the wild have commits that record nonsense
73
- committer timezone (e.g. rails.git); "git fast-import" learned an
74
- option to pass these nonsense timestamps intact to allow recreating
75
- existing repositories as-is.
96
+ "git log -L..." now takes advantage of the "which paths are touched
97
+ by this commit?" info stored in the commit-graph system.
98
99
78
-* jn/experimental-opts-into-proto-v2 (2020-05-21) 1 commit
79
- (merged to 'next' on 2020-05-24 at 53cd664dfe)
80
- + config: let feature.experimental imply protocol.version=2
100
+* es/bugreport-shell (2020-05-12) 2 commits
101
+ (merged to 'next' on 2020-05-24 at 79c5c8308b)
102
+ + bugreport: include user interactive shell
103
+ + help: add shell-path to --build-options
104
82
- "feature.experimental" configuration variable is to let volunteers
83
- easily opt into a set of newer features, which use of the v2
84
- transport protocol is now a part of.
105
+ "git bugreport" learns to report what shell is in use.
106
+ We may want to learn more details than just the path, but
107
+ that can come later.
108
+ cf. <20200512235924.GC6605@camp.crustytoothpaste.net>
109
110
87
-* jx/pkt-line-doc-count-fix (2020-05-21) 1 commit
88
- (merged to 'next' on 2020-05-24 at 7115240db4)
89
- + doc: fix wrong 4-byte length of pkt-line message
111
+* js/checkout-p-new-file (2020-05-27) 1 commit
112
+ (merged to 'next' on 2020-05-31 at 017c325bf6)
113
+ + checkout -p: handle new files correctly
114
91
- Docfix.
115
+ "git checkout -p" did not handle a newly added path at all.
116
117
94
-* la/diff-relative-config (2020-05-24) 1 commit
95
- (merged to 'next' on 2020-05-26 at b4604e6abc)
96
- + diff: add config option relative
118
+* jt/curl-verbose-on-trace-curl (2020-05-11) 2 commits
119
+ (merged to 'next' on 2020-05-11 at 814e31b9d4)
120
+ + http, imap-send: stop using CURLOPT_VERBOSE
121
+ + t5551: test that GIT_TRACE_CURL redacts password
122
+ (this branch is used by jt/redact-all-cookies.)
123
98
- The commands in the "diff" family learned to honor "diff.relative"
99
- configuration variable.
124
+ Rewrite support for GIT_CURL_VERBOSE in terms of GIT_TRACE_CURL.
125
126
102
-* lo/sparse-universal-zero-init (2020-05-24) 1 commit
103
- (merged to 'next' on 2020-05-24 at 1f4ea6b348)
104
- + sparse: allow '{ 0 }' to be used without warnings
127
+* rs/fsck-duplicate-names-in-trees (2020-05-21) 4 commits
128
+ (merged to 'next' on 2020-05-24 at 6e1d6ba087)
129
+ + fsck: detect more in-tree d/f conflicts
130
+ + t1450: demonstrate undetected in-tree d/f conflict
131
+ + t1450: increase test coverage of in-tree d/f detection
132
+ + fsck: fix a typo in a comment
133
106
- We've adopted a convention that any on-stack structure can be
107
- initialized to have zero values in all fields with "= { 0 }", even
108
- when the first field happens to be a pointer, but sparse complained
109
- that a null pointer should be spelled NULL for a long time. Start
110
- using -Wno-universal-initializer option to squelch it.
134
+ The check in "git fsck" to ensure that the tree objects are sorted
135
+ still had corner cases it missed unsorted entries.
136
137
113
-* mt/zsh-completion-optim (2020-05-28) 1 commit
114
- (merged to 'next' on 2020-05-31 at f5d02a5498)
115
- + completion: use native ZSH array pattern matching
138
+* tb/commit-graph-no-check-oids (2020-05-18) 8 commits
139
+ (merged to 'next' on 2020-05-24 at 72bd1063ca)
140
+ + commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag
141
+ + t5318: reorder test below 'graph_read_expect'
142
+ + commit-graph.c: simplify 'fill_oids_from_commits'
143
+ + builtin/commit-graph.c: dereference tags in builtin
144
+ + builtin/commit-graph.c: extract 'read_one_commit()'
145
+ + commit-graph.c: peel refs in 'add_ref_to_set'
146
+ + commit-graph.c: show progress of finding reachable commits
147
+ + commit-graph.c: extract 'refs_cb_data'
148
117
- Command line completion (incontrib/) update.
149
+ Clean-up the commit-graph codepath.
150
151
120
-* rs/checkout-b-track-error (2020-05-24) 2 commits
121
- (merged to 'next' on 2020-05-26 at 9220e43203)
122
- + checkout: improve error messages for -b with extra argument
123
- + checkout: add tests for -b and --track
152
+* vs/complete-stash-show-p-fix (2020-05-21) 1 commit
153
+ (merged to 'next' on 2020-05-24 at fcbff29a0f)
154
+ + completion: don't override given stash subcommand with -p
155
125
- The error message from "git checkout -b foo -t bar baz" was
126
- confusing.
156
+ The command line completion script (in contrib/) tried to complete
157
+ "git stash -p" as if it were "git stash push -p", but it was too
158
+ aggressive and also affected "git stash show -p", which has been
159
+ corrected.
160
161
--------------------------------------------------
162
[New Topics]
163
131
-* jk/diff-memuse-optim-with-stat-unmatch (2020-06-02) 1 commit
132
- - diff: discard blob data from stat-unmatched pairs
164
+* en/sparse-checkout (2020-06-05) 1 commit
165
+ - sparse-checkout: avoid staging deletions of all files
166
134
- Reduce memory usage during "diff --quiet" in a worktree with too
135
- many stat-unmatched paths.
167
+ The behaviour of "sparse-checkout" in the state "git clone
168
+ --no-checkout" left was changed accidentally in 2.27, which has
169
+ been corrected.
170
171
Will merge to 'next'.
172
173
140
-* js/reflog-anonymize-for-clone-and-fetch (2020-06-02) 1 commit
141
- - clone/fetch: anonymize URLs in the reflog
174
+* js/msvc-build-fix (2020-06-04) 1 commit
175
+ - msvc: fix "REG_STARTEND" issue
176
143
- The reflog entries for "git clone" and "git fetch" did not
144
- anonymize the URL they operated on.
177
+ Workaround breakage in MSVC build, where "curl-config --cflags"
178
+ gives settings appropriate for GCC build.
179
180
Will merge to 'next'.
181
182
149
-* tb/t5318-cleanup (2020-06-02) 2 commits
150
- - t5318: test that '--stdin-commits' respects '--[no-]progress'
151
- - t5318: use 'test_must_be_empty'
183
+* en/do-match-pathspec-fix (2020-06-05) 1 commit
184
+ - dir: fix treatment of negated pathspecs
185
153
- Code cleanup.
186
+ Use of negative pathspec, while collecting paths including
187
+ untracked ones in the working tree, was broken.
188
155
- Almost there.
156
- cf. <20200602180403.GA4791@szeder.dev>
189
+ Will merge to 'next'.
190
+
191
+
192
+* jt/redact-all-cookies (2020-06-05) 1 commit
193
+ - http: redact all cookies, teach GIT_TRACE_REDACT=0
194
+
195
+ The interface to redact sensitive information in the trace output
196
+ has been simplified.
197
+
198
+ Will merge to 'next'.
199
+
200
+
201
+* dl/python-2.7-is-the-floor-version (2020-06-08) 1 commit
202
+ - CodingGuidelines: specify Python 2.7 is the oldest version
203
+
204
+ Document that we do not support Python 2.6 or older.
205
+
206
+ Will merge to 'next'.
207
+
208
+
209
+* dl/t-readme-spell-git-correctly (2020-06-08) 1 commit
210
+ - t/README: avoid poor-man's small caps GIT
211
+
212
+ Doc updates.
213
+
214
+ Will merge to 'next'.
215
+
216
+
217
+* es/advertise-contribution-doc (2020-06-08) 1 commit
218
+ - docs: mention MyFirstContribution in more places
219
+
220
+ Doc updates.
221
+
222
+ Will merge to 'next'.
223
+
224
+
225
+* es/worktree-duplicate-paths (2020-06-10) 7 commits
226
+ - worktree: make "move" refuse to move atop missing registered worktree
227
+ - worktree: generalize candidate worktree path validation
228
+ - worktree: prune linked worktree referencing main worktree path
229
+ - worktree: prune duplicate entries referencing same worktree path
230
+ - worktree: make high-level pruning re-usable
231
+ - worktree: give "should be pruned?" function more meaningful name
232
+ - worktree: factor out repeated string literal
233
+
234
+ The same worktree directory must be registered only once, but
235
+ "git worktree move" allowed this invariant to be violated, which
236
+ has been corrected.
237
+
238
+ Will merge to 'next'.
239
+
240
+
241
+* js/fuzz-commit-graph-leakfix (2020-06-08) 1 commit
242
+ - fuzz-commit-graph: properly free graph struct
243
+
244
+ Leakfix.
245
+
246
+ Will merge to 'next'.
247
+
248
+
249
+* sg/commit-graph-cleanups (2020-06-08) 10 commits
250
+ - commit-graph: simplify write_commit_graph_file() #2
251
+ - commit-graph: simplify write_commit_graph_file() #1
252
+ - commit-graph: simplify parse_commit_graph() #2
253
+ - commit-graph: simplify parse_commit_graph() #1
254
+ - commit-graph: clean up #includes
255
+ - diff.h: drop diff_tree_oid() & friends' return value
256
+ - commit-slab: add a function to deep free entries on the slab
257
+ - commit-graph-format.txt: all multi-byte numbers are in network byte order
258
+ - commit-graph: fix parsing the Chunk Lookup table
259
+ - tree-walk.c: don't match submodule entries for 'submod/anything'
260
+
261
+ Code cleanup.
262
263
--------------------------------------------------
264
[Stalled]
@@ -216,8 +321,34 @@ of the repositories listed at
321
--------------------------------------------------
322
[Cooking]
323
219
-* cc/upload-pack-data-2 (2020-06-02) 14 commits
220
- - fixup! upload-pack: change multi_ack to an enum
324
+* jk/diff-memuse-optim-with-stat-unmatch (2020-06-02) 1 commit
325
+ - diff: discard blob data from stat-unmatched pairs
326
+
327
+ Reduce memory usage during "diff --quiet" in a worktree with too
328
+ many stat-unmatched paths.
329
+
330
+ Will merge to 'next'.
331
+
332
+
333
+* js/reflog-anonymize-for-clone-and-fetch (2020-06-04) 1 commit
334
+ - clone/fetch: anonymize URLs in the reflog
335
+
336
+ The reflog entries for "git clone" and "git fetch" did not
337
+ anonymize the URL they operated on.
338
+
339
+ Will merge to 'next'.
340
+
341
+
342
+* tb/t5318-cleanup (2020-06-04) 2 commits
343
+ - t5318: test that '--stdin-commits' respects '--[no-]progress'
344
+ - t5318: use 'test_must_be_empty'
345
+
346
+ Code cleanup.
347
+
348
+ Will merge to 'next'.
349
+
350
+
351
+* cc/upload-pack-data-2 (2020-06-04) 13 commits
352
- upload-pack: move pack_objects_hook to upload_pack_data
353
- upload-pack: move allow_sideband_all to upload_pack_data
354
- upload-pack: move allow_ref_in_want to upload_pack_data
@@ -231,29 +362,22 @@ of the repositories listed at
362
- upload-pack: move static vars to upload_pack_data
363
- upload-pack: annotate upload_pack_data fields
364
- upload-pack: actually use some upload_pack_data bitfields
234
- (this branch uses cc/upload-pack-data.)
365
366
Further code clean-up.
367
238
- Almost there.
239
-
240
-
241
-* js/checkout-p-new-file (2020-05-27) 1 commit
242
- (merged to 'next' on 2020-05-31 at 017c325bf6)
243
- + checkout -p: handle new files correctly
244
-
245
- "git checkout -p" did not handle a newly added path at all.
246
-
247
- Will merge to 'master'.
368
+ Will merge to 'next'.
369
370
250
-* xl/upgrade-repo-format (2020-05-29) 1 commit
371
+* xl/upgrade-repo-format (2020-06-05) 4 commits
372
+ - check_repository_format_gently(): refuse extensions for old repositories
373
+ - sparse-checkout: upgrade repository to version 1 when enabling extension
374
- fetch: allow adding a filter after initial clone
375
+ - repository: add a helper function to perform repository format upgrade
376
377
Allow runtime upgrade of the repository format version, which needs
378
to be done carefully.
379
256
- Almost there.
380
+ Almost there. It does not seem to play well with hn/reftable
381
382
383
* jk/complete-git-switch (2020-05-28) 16 commits
@@ -277,6 +401,8 @@ of the repositories listed at
401
The command line completion (in contrib/) learned to complete
402
options that the "git switch" command takes.
403
404
+ Is this ready?
405
+
406
407
* en/sparse-with-submodule-doc (2020-05-25) 1 commit
408
- git-sparse-checkout: clarify interactions with submodules
@@ -286,39 +412,6 @@ of the repositories listed at
412
Needs review.
413
414
289
-* bc/filter-process (2020-05-21) 2 commits
290
- (merged to 'next' on 2020-05-24 at 3d51328096)
291
- + t2060: add a test for switch with --orphan and --discard-changes
292
- + builtin/checkout: simplify metadata initialization
293
-
294
- Code simplification and test coverage enhancement.
295
-
296
- Will merge to 'master'.
297
-
298
-
299
-* cb/bisect-helper-parser-fix (2020-05-24) 1 commit
300
- (merged to 'next' on 2020-05-24 at d30e10fa86)
301
- + bisect--helper: avoid segfault with bad syntax in `start --term-*`
302
-
303
- The code to parse "git bisect start" command line was lax in
304
- validating the arguments.
305
-
306
- Will merge to 'master'.
307
-
308
-
309
-* rs/fsck-duplicate-names-in-trees (2020-05-21) 4 commits
310
- (merged to 'next' on 2020-05-24 at 6e1d6ba087)
311
- + fsck: detect more in-tree d/f conflicts
312
- + t1450: demonstrate undetected in-tree d/f conflict
313
- + t1450: increase test coverage of in-tree d/f detection
314
- + fsck: fix a typo in a comment
315
-
316
- The check in "git fsck" to ensure that the tree objects are sorted
317
- still had corner cases it missed unsorted entries.
318
-
319
- Will merge to 'master'.
320
-
321
-
415
* ss/submodule-set-branch-in-c (2020-06-02) 1 commit
416
- submodule: port subcommand 'set-branch' from shell to C
417
@@ -330,23 +423,13 @@ of the repositories listed at
423
cf. <1b851e49-3bb1-3b59-7f24-b903c5514391@gmail.com>
424
425
333
-* vs/complete-stash-show-p-fix (2020-05-21) 1 commit
334
- (merged to 'next' on 2020-05-24 at fcbff29a0f)
335
- + completion: don't override given stash subcommand with -p
336
-
337
- The command line completion script (in contrib/) tried to complete
338
- "git stash -p" as if it were "git stash push -p", but it was too
339
- aggressive and also affected "git stash show -p", which has been
340
- corrected.
341
-
342
- Will merge to 'master'.
343
-
344
-
426
* es/config-hooks (2020-05-21) 4 commits
346
- . hook: add --porcelain to list command
347
- . hook: add list command
348
- . hook: scaffolding for git-hook subcommand
349
- . doc: propose hooks managed by the config
427
+ - hook: add --porcelain to list command
428
+ - hook: add list command
429
+ - hook: scaffolding for git-hook subcommand
430
+ - doc: propose hooks managed by the config
431
+
432
+ The "hooks defined in config" topic.
433
434
435
* pw/rebase-i-more-options (2020-05-27) 5 commits
@@ -358,72 +441,10 @@ of the repositories listed at
441
442
"git rebase -i" learns a bit more options.
443
361
- Not quite
444
+ Not quite.
445
cf. <nycvar.QRO.7.76.6.2005290437350.56@tvgsbejvaqbjf.bet>
446
447
365
-* cc/upload-pack-data (2020-05-18) 13 commits
366
- (merged to 'next' on 2020-05-29 at 66008d9209)
367
- + upload-pack: use upload_pack_data fields in receive_needs()
368
- + upload-pack: pass upload_pack_data to create_pack_file()
369
- + upload-pack: remove static variable 'stateless_rpc'
370
- + upload-pack: pass upload_pack_data to check_non_tip()
371
- + upload-pack: pass upload_pack_data to send_ref()
372
- + upload-pack: move symref to upload_pack_data
373
- + upload-pack: use upload_pack_data writer in receive_needs()
374
- + upload-pack: pass upload_pack_data to receive_needs()
375
- + upload-pack: pass upload_pack_data to get_common_commits()
376
- + upload-pack: use 'struct upload_pack_data' in upload_pack()
377
- + upload-pack: move 'struct upload_pack_data' around
378
- + upload-pack: move {want,have}_obj to upload_pack_data
379
- + upload-pack: remove unused 'wants' from upload_pack_data
380
- (this branch is used by cc/upload-pack-data-2.)
381
-
382
- Code clean-up.
383
-
384
- Will merge to 'master'.
385
-
386
-
387
-* dl/remote-curl-deadlock-fix (2020-05-24) 7 commits
388
- (merged to 'next' on 2020-05-26 at 072714ca7f)
389
- + stateless-connect: send response end packet
390
- + pkt-line: define PACKET_READ_RESPONSE_END
391
- + remote-curl: error on incomplete packet
392
- + pkt-line: extern packet_length()
393
- + transport: extract common fetch_pack() call
394
- + remote-curl: remove label indentation
395
- + remote-curl: fix typo
396
-
397
- On-the-wire protocol v2 easily falls into a deadlock between the
398
- remote-curl helper and the fetch-pack process when the server side
399
- prematurely throws an error and disconnects. The communication has
400
- been updated to make it more robust.
401
-
402
- Will merge to 'master'.
403
-
404
-
405
-* cb/t4210-illseq-auto-detect (2020-05-18) 2 commits
406
- (merged to 'next' on 2020-05-24 at c03b4095fa)
407
- + t4210: detect REG_ILLSEQ dynamically and skip affected tests
408
- + t/helper: teach test-regex to report pattern errors (like REG_ILLSEQ)
409
-
410
- As FreeBSD is not the only platform whose regexp library reports
411
- a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that
412
- automatically and skip the affected tests.
413
-
414
- Will merge to 'master'.
415
-
416
-
417
-* jt/curl-verbose-on-trace-curl (2020-05-11) 2 commits
418
- (merged to 'next' on 2020-05-11 at 814e31b9d4)
419
- + http, imap-send: stop using CURLOPT_VERBOSE
420
- + t5551: test that GIT_TRACE_CURL redacts password
421
-
422
- Rewrite support for GIT_CURL_VERBOSE in terms of GIT_TRACE_CURL.
423
-
424
- Expecting further work on optionally disabling redacting authinfo
425
-
426
-
448
* mt/grep-sparse-checkout (2020-06-02) 6 commits
449
- git.c: fix sparse warning
450
- config: add setting to ignore sparsity patterns in some cmds
@@ -489,49 +510,6 @@ of the repositories listed at
510
SHA-256 migration work continues.
511
512
492
-* es/bugreport-shell (2020-05-12) 2 commits
493
- (merged to 'next' on 2020-05-24 at 79c5c8308b)
494
- + bugreport: include user interactive shell
495
- + help: add shell-path to --build-options
496
-
497
- "git bugreport" learns to report what shell is in use.
498
-
499
- Will merge to 'master'.
500
- We may want to learn more details than just the path, but
501
- that can come later.
502
- cf. <20200512235924.GC6605@camp.crustytoothpaste.net>
503
-
504
-
505
-* ds/line-log-on-bloom (2020-05-11) 5 commits
506
- (merged to 'next' on 2020-05-11 at 046d49d455)
507
- + line-log: integrate with changed-path Bloom filters
508
- + line-log: try to use generation number-based topo-ordering
509
- + line-log: more responsive, incremental 'git log -L'
510
- + t4211-line-log: add tests for parent oids
511
- + line-log: remove unused fields from 'struct line_log_data'
512
-
513
- "git log -L..." now takes advantage of the "which paths are touched
514
- by this commit?" info stored in the commit-graph system.
515
-
516
- Will merge to 'master'.
517
-
518
-
519
-* tb/commit-graph-no-check-oids (2020-05-18) 8 commits
520
- (merged to 'next' on 2020-05-24 at 72bd1063ca)
521
- + commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag
522
- + t5318: reorder test below 'graph_read_expect'
523
- + commit-graph.c: simplify 'fill_oids_from_commits'
524
- + builtin/commit-graph.c: dereference tags in builtin
525
- + builtin/commit-graph.c: extract 'read_one_commit()'
526
- + commit-graph.c: peel refs in 'add_ref_to_set'
527
- + commit-graph.c: show progress of finding reachable commits
528
- + commit-graph.c: extract 'refs_cb_data'
529
-
530
- Clean-up the commit-graph codepath.
531
-
532
- Will merge to 'master'.
533
-
534
-
513
* jx/proc-receive-hook (2020-05-18) 11 commits
514
- doc: add documentation for the proc-receive hook
515
- transport: parse report options for tracking refs
@@ -551,10 +529,8 @@ of the repositories listed at
529
Needs review.
530
531
554
-* hn/refs-cleanup (2020-05-27) 7 commits
555
- (merged to 'next' on 2020-05-27 at aada2199e1)
556
- + reftable doc: use link: and urlencode to avoid dead links
557
- (merged to 'next' on 2020-05-24 at dd9b665698)
532
+* hn/refs-cleanup (2020-06-09) 6 commits
533
+ (merged to 'next' on 2020-06-09 at abb59f83a2)
534
+ reftable: define version 2 of the spec to accomodate SHA256
535
+ reftable: clarify how empty tables should be written
536
+ reftable: file format documentation
@@ -566,15 +542,14 @@ of the repositories listed at
542
Preliminary clean-ups around refs API, plus file format
543
specification documentation for the reftable backend.
544
569
- Will merge to 'master' after squashing the fix in.
570
- We probably would want to squash the fix at the tip to an earlier
571
- step when we rewind the 'next' branch.
545
+ Will merge to 'master'.
546
547
574
-* hn/reftable (2020-05-28) 13 commits
548
+* hn/reftable (2020-06-09) 14 commits
549
. Add reftable testing infrastructure
550
. vcxproj: adjust for the reftable changes
551
. Add GIT_DEBUG_REFS debugging mechanism
552
+ . Hookup unittests for the reftable library.
553
. Reftable support for git-core
554
. Add reftable library
555
. Add .gitattributes for the reftable/ directory
@@ -592,7 +567,7 @@ of the repositories listed at
567
has been implemented and integrated for improved performance and
568
atomicity.
569
595
- Not quite--does not pass tests by itself.
570
+ Does not seem to build from the source.
571
572
--------------------------------------------------
573
[Discarded]