What's cooking (2020/06 #05)
Junio C Hamano committed
Jun 25, 2020 at 15:23 UTC
e141547437a4b0cd7a84fab726bcac1e34e2805b
1 file changed
+330
-279
whats-cooking.txt
+330
-279
@@ -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, #04; Mon, 22)
4
-X-master-at: c9c318d6bf26bcecdca5b6f31683b9d5887a83ee
5
-X-next-at: 4b34aa94c75220f6f4cd334b08a3fb053128a32d
3
+Subject: What's cooking in git.git (Jun 2020, #05; Thu, 25)
4
+X-master-at: f402ea68166bd77f09b176c96005ac7f8886e14b
5
+X-next-at: b9a2d1a0207fb9ded3fa524f54db3bc322a12cc4
6
7
-What's cooking in git.git (Jun 2020, #04; Mon, 22)
7
+What's cooking in git.git (Jun 2020, #05; Thu, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,18 +12,8 @@ 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 few topiocs have graduated to 'master'. As I expect that the next
16
-week would be slower than usual due to being summer (and folks in US
17
-having holidays), I am hoping that I can merge down a handful more
18
-topics from 'next', perhaps with shorter gestation period than
19
-usual, by the end of this week.
20
-
21
-The 'pu' (proposed updates) branch has been renamed to 'seen' to use
22
-a more meaningful name (after all, the purpose of it is not to
23
-contain all proposals, but to merely serve as a place to park what
24
-the maintainer happened to have seen) and more importantly, to make
25
-room for topics from those contributors whose two-letter name
26
-abbreviation needs to be 'pu' under 'pu/$topicName'.
15
+A handful of topics have graduated to 'master' and a bunch of topics
16
+have been merged to 'next'.
17
18
You can find the changes described here in the integration branches of the
19
repositories listed at
@@ -33,203 +23,237 @@ repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
36
-* cc/upload-pack-data-2 (2020-06-04) 13 commits
37
- (merged to 'next' on 2020-06-12 at ee63b70dc2)
38
- + upload-pack: move pack_objects_hook to upload_pack_data
39
- + upload-pack: move allow_sideband_all to upload_pack_data
40
- + upload-pack: move allow_ref_in_want to upload_pack_data
41
- + upload-pack: move allow_filter to upload_pack_data
42
- + upload-pack: move keepalive to upload_pack_data
43
- + upload-pack: pass upload_pack_data to upload_pack_config()
44
- + upload-pack: change multi_ack to an enum
45
- + upload-pack: move multi_ack to upload_pack_data
46
- + upload-pack: move filter_capability_requested to upload_pack_data
47
- + upload-pack: move use_sideband to upload_pack_data
48
- + upload-pack: move static vars to upload_pack_data
49
- + upload-pack: annotate upload_pack_data fields
50
- + upload-pack: actually use some upload_pack_data bitfields
51
- (this branch is used by cc/upload-pack-data-3 and jt/cdn-offload.)
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
53
- Further code clean-up.
43
+ Code clean-up in the codepath that serves "git fetch" continues.
44
45
56
-* en/sparse-with-submodule-doc (2020-06-12) 1 commit
57
- (merged to 'next' on 2020-06-17 at 3521be3834)
58
- + git-sparse-checkout: clarify interactions with submodules
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
60
- The effect of sparse checkout settings on submodules is documented.
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
63
-* es/worktree-duplicate-paths (2020-06-10) 7 commits
64
- (merged to 'next' on 2020-06-12 at 5f7c822a9d)
65
- + worktree: make "move" refuse to move atop missing registered worktree
66
- + worktree: generalize candidate worktree path validation
67
- + worktree: prune linked worktree referencing main worktree path
68
- + worktree: prune duplicate entries referencing same worktree path
69
- + worktree: make high-level pruning re-usable
70
- + worktree: give "should be pruned?" function more meaningful name
71
- + worktree: factor out repeated string literal
72
- (this branch is used by es/get-worktrees-unsort.)
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
74
- The same worktree directory must be registered only once, but
75
- "git worktree move" allowed this invariant to be violated, which
76
- has been corrected.
63
+ Code clean-up around "git branch" with a minor bugfix.
64
65
79
-* jt/redact-all-cookies (2020-06-05) 1 commit
80
- (merged to 'next' on 2020-06-12 at 912c337d63)
81
- + http: redact all cookies, teach GIT_TRACE_REDACT=0
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
83
- The interface to redact sensitive information in the trace output
84
- has been simplified.
72
+ "git merge-base --is-ancestor" is taught to take advantage of the
73
+ commit graph.
74
86
---------------------------------------------------
87
-[New Topics]
75
89
-* en/sparse-status (2020-06-22) 3 commits
90
- - git-prompt: include sparsity state as well
91
- - git-prompt: document how in-progress operations affect the prompt
92
- - wt-status: show sparse checkout status as well
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
94
- "git status" learned to report the status of sparse checkout.
83
+ Code clean-up of "git clean" resulted in a fix of recent
84
+ performance regression.
85
96
- Will merge to 'next'.
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
99
-* dl/diff-usage-comment-update (2020-06-18) 1 commit
100
- (merged to 'next' on 2020-06-19 at b53a12bb66)
101
- + builtin/diff: update usage comment
106
+ The command line completion (in contrib/) learned to complete
107
+ options that the "git switch" command takes.
108
103
- An in-code comment in "git diff" has been updated.
109
105
- Will merge to 'master'.
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
108
-* ps/ref-transaction-hook (2020-06-19) 1 commit
109
- (merged to 'next' on 2020-06-22 at 3a23dcdbdc)
110
- + refs: implement reference transaction hook
127
112
- A new hook.
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
114
- Will merge to 'master'.
132
+ A branch name used in a test has been clarified to match what is
133
+ going on.
134
135
117
-* sk/diff-files-show-i-t-a-as-new (2020-06-22) 1 commit
118
- (merged to 'next' on 2020-06-22 at 825a823416)
119
- + diff-files: treat "i-t-a" files as "not-in-index"
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
139
121
- "git diff-files" has been taught to say paths that are marked as
122
- intent-to-add are new files, not modified from an empty blob.
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.
143
+
144
+--------------------------------------------------
145
+[New Topics]
146
+
147
+* bc/http-push-flagsfix (2020-06-23) 1 commit
148
+ (merged to 'next' on 2020-06-25 at 1dabb1f61b)
149
+ + http-push: ensure unforced pushes fail when data would be lost
150
+
151
+ The code to push changes over "dumb" HTTP had a bad interaction
152
+ with the commit reachability code due to incorrect allocation of
153
+ object flag bits, which has been corrected.
154
155
Will merge to 'master'.
156
157
127
-* jk/fast-export-anonym (2020-06-22) 4 commits
128
- (merged to 'next' on 2020-06-22 at b517b2f707)
129
- + fast-export: allow dumping the path mapping
130
- + fast-export: refactor path printing to not rely on stdout
131
- + fast-export: anonymize "master" refname
132
- + fast-export: allow dumping the refname mapping
158
+* cb/is-descendant-of (2020-06-23) 1 commit
159
+ (merged to 'next' on 2020-06-25 at ca0eaddf5e)
160
+ + commit-reach: avoid is_descendant_of() shim
161
134
- The way refnames are anonymized has been updated and a way to help
135
- debugging using the anonymized output hsa been added.
162
+ Code clean-up.
163
164
Will merge to 'master'.
165
166
140
-* pb/t4014-unslave (2020-06-19) 1 commit
141
- (merged to 'next' on 2020-06-19 at 4d328a12d9)
142
- + t4014: do not use "slave branch" nomenclature
167
+* 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
179
144
- A branch name used in a test has been clarified to match what is
145
- going on.
180
+ "git fast-export --anonymize" learned to take customized mapping to
181
+ allow its users to tweak its output more usable for debugging.
182
147
- Will merge to 'master'.
183
+ Will merge to 'next'.
184
185
150
-* rs/commit-reach-leakfix (2020-06-19) 1 commit
151
- (merged to 'next' on 2020-06-22 at fcc1e385f0)
152
- + commit-reach: plug minor memory leak after using is_descendant_of()
186
+* 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.)
190
154
- Leakfix.
191
+ "git difftool" has trouble dealing with paths added to the index
192
+ with the intent-to-add bit.
193
156
- Will merge to 'master'.
194
+ Will merge to 'next'.
195
196
159
-* rs/pull-leakfix (2020-06-19) 1 commit
160
- (merged to 'next' on 2020-06-22 at d80a6b9ca3)
161
- + pull: plug minor memory leak after using is_descendant_of()
197
+* js/pu-to-seen (2020-06-25) 3 commits
198
+ (merged to 'next' on 2020-06-25 at 06c9e5a885)
199
+ + tests: reference `seen` wherever `pu` was referenced
200
+ + docs: adjust the technical overview for the rename `pu` -> `seen`
201
+ + docs: adjust for the recent rename of `pu` to `seen`
202
163
- Leakfix.
203
+ The documentation and some tests have been adjusted for the recent
204
+ renaming of "pu" branch to "seen".
205
206
Will merge to 'master'.
207
208
168
-* rs/retire-strbuf-write-fd (2020-06-19) 2 commits
169
- (merged to 'next' on 2020-06-22 at c175b54f2a)
170
- + strbuf: remove unreferenced strbuf_write_fd method.
171
- + bugreport.c: replace strbuf_write_fd with write_in_full
209
+* mk/pb-pretty-email-without-domain-part-fix (2020-06-23) 1 commit
210
+ (merged to 'next' on 2020-06-25 at 81a3aca46b)
211
+ + doc: fix author vs. committer copy/paste error
212
173
- A misdesigned strbuf_write_fd() function has been retired.
213
+ Docfix.
214
215
Will merge to 'master'.
216
217
178
-* bc/sha-256-cvs-svn-updates (2020-06-22) 14 commits
179
- - git-cvsexportcommit: port to SHA-256
180
- - git-cvsimport: port to SHA-256
181
- - git-cvsserver: port to SHA-256
182
- - git-svn: set the OID length based on hash algorithm
183
- - perl: make SVN code hash independent
184
- - perl: make Git::IndexInfo work with SHA-256
185
- - perl: create and switch variables for hash constants
186
- - t/lib-git-svn: make hash size independent
187
- - t9101: make hash independent
188
- - t9104: make hash size independent
189
- - t9100: make test work with SHA-256
190
- - t9108: make test hash independent
191
- - t9168: make test hash independent
192
- - t9109: make test hash independent
193
- (this branch uses bc/sha-256-part-2.)
218
+* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits
219
+ - submodule: use submodule repository when preparing summary
220
+ - revision: use repository from rev_info when parsing commits
221
195
- CVS/SVN interface have been prepared for SHA-256 transition
222
+ "git diff/show" on a change that involves a submodule used to read
223
+ the information on commits in the submodule from a wrong repository
224
+ and gave a wrong information when the commit-graph is involved.
225
197
- Will merge to 'next'.
226
+ Needs tests.
227
228
200
-* ds/commit-graph-bloom-updates (2020-06-17) 8 commits
201
- - commit-graph: persist existence of changed-paths
202
- - commit-graph: change test to die on parse, not load
203
- - bloom: enforce a minimum size of 8 bytes
204
- - commit-graph: check all leading directories in changed path Bloom filters
205
- - commit-graph: check chunk sizes after writing
206
- - commit-graph: simplify chunk writes into loop
207
- - commit-graph: unify the signatures of all write_graph_chunk_*() functions
208
- - commit-graph: place bloom_settings in context
209
- (this branch uses sg/commit-graph-cleanups.)
229
+* rs/pack-bits-in-object-better (2020-06-24) 1 commit
230
+ (merged to 'next' on 2020-06-25 at b3cb296341)
231
+ + revision: reallocate TOPO_WALK object flags
232
211
- Updates to the changed-paths bloom filter.
233
+ By renumbering object flag bits, "struct object" managed to lose
234
+ bloated inter-field padding.
235
213
- Being discussed.
214
- cf. <20200619171922.GA57283@syl.local>
236
+ Will merge to 'master'.
237
238
217
-* es/get-worktrees-unsort (2020-06-22) 2 commits
218
- - worktree: drop get_worktrees() unused 'flags' argument
219
- - worktree: drop get_worktrees() special-purpose sorting option
239
+* es/worktree-code-cleanup (2020-06-24) 1 commit
240
+ - worktree: avoid dead-code in conditional
241
221
- API cleanup for get_worktrees()
242
+ Code cleanup.
243
244
Will merge to 'next'.
245
246
226
-* jl/complete-git-prune (2020-06-22) 1 commit
227
- - bash-completion: add git-prune into bash completion
247
+* ra/send-email-in-reply-to-from-command-line-wins (2020-06-24) 1 commit
248
+ - send-email: restore --in-reply-to superseding behavior
249
229
- Add "git prune" to the completion (in contrib/), which could be
230
- typed by end-users from the command line.
250
+ "git send-email --in-reply-to=<msg>" did not use the In-Reply-To:
251
+ header with the value given from the command line, and let it be
252
+ overridden by the value on In-Reply-To: header in the messages
253
+ being sent out (if exists).
254
232
- Will merge to 'next'.
255
+ Expecting a reroll/redesign.
256
+ Does not behave sensibly for a multi-patch series.
257
258
--------------------------------------------------
259
[Stalled]
@@ -277,75 +301,168 @@ repositories listed at
301
--------------------------------------------------
302
[Cooking]
303
280
-* cc/upload-pack-data-3 (2020-06-11) 14 commits
281
- (merged to 'next' on 2020-06-17 at 393eff577a)
282
- + upload-pack: refactor common code into do_got_oid()
283
- + upload-pack: move oldest_have to upload_pack_data
284
- + upload-pack: pass upload_pack_data to got_oid()
285
- + upload-pack: pass upload_pack_data to ok_to_give_up()
286
- + upload-pack: pass upload_pack_data to send_acks()
287
- + upload-pack: pass upload_pack_data to process_haves()
288
- + upload-pack: change allow_unadvertised_object_request to an enum
289
- + upload-pack: move allow_unadvertised_object_request to upload_pack_data
290
- + upload-pack: move extra_edge_obj to upload_pack_data
291
- + upload-pack: move shallow_nr to upload_pack_data
292
- + upload-pack: pass upload_pack_data to send_unshallow()
293
- + upload-pack: pass upload_pack_data to deepen_by_rev_list()
294
- + upload-pack: pass upload_pack_data to deepen()
295
- + upload-pack: pass upload_pack_data to send_shallow_list()
304
+* en/sparse-status (2020-06-22) 3 commits
305
+ (merged to 'next' on 2020-06-25 at 404403a075)
306
+ + git-prompt: include sparsity state as well
307
+ + git-prompt: document how in-progress operations affect the prompt
308
+ + wt-status: show sparse checkout status as well
309
297
- Code clean-up in the codepath that serves "git fetch" continues.
310
+ "git status" learned to report the status of sparse checkout.
311
312
Will merge to 'master'.
313
314
302
-* ct/diff-with-merge-base-clarification (2020-06-12) 3 commits
303
- (merged to 'next' on 2020-06-17 at e0b54a001c)
304
- + Documentation: usage for diff combined commits
305
- + git diff: improve range handling
306
- + t/t3430: avoid undefined git diff behavior
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
308
- "git diff" used to take arguments in random and nonsense range
309
- notation, e.g. "git diff A..B C", "git diff A..B C...D", etc.,
310
- which has been cleaned up.
321
+ An in-code comment in "git diff" has been updated.
322
323
Will merge to 'master'.
324
325
315
-* js/default-branch-name (2020-06-19) 8 commits
316
- - Document how the default branch name can be overridden
317
- - fmt-merge-msg: learn about the possibly-configured default branch name
318
- - clone: learn about the possibly-configured default branch name
319
- - submodule: use the (possibly overridden) default branch name
320
- - testsvn: respect `core.defaultBranchName`
321
- - send-pack/transport-helper: respect `core.defaultBranchName`
322
- - remote: respect `core.defaultBranchName`
323
- - init: allow overriding the default branch name for new repositories
326
+* ps/ref-transaction-hook (2020-06-19) 1 commit
327
+ (merged to 'next' on 2020-06-22 at 3a23dcdbdc)
328
+ + refs: implement reference transaction hook
329
325
- The name of the primary branch in existing repositories, and the
326
- default name used for the first branch in newly created
327
- repositories, is made configurable, so that we can eventually wean
328
- ourselves off of the hardcoded 'master'.
330
+ A new hook.
331
330
- Expecting a reroll.
332
+ Will merge to 'master'.
333
334
333
-* jt/cdn-offload (2020-06-17) 10 commits
334
- (merged to 'next' on 2020-06-18 at e8ba1cc988)
335
- + upload-pack: fix a sparse '0 as NULL pointer' warning
336
- + upload-pack: send part of packfile response as uri
337
- + fetch-pack: support more than one pack lockfile
338
- + upload-pack: refactor reading of pack-objects out
339
- + Documentation: add Packfile URIs design doc
340
- + Documentation: order protocol v2 sections
341
- + http-fetch: support fetching packfiles by URL
342
- + http-fetch: refactor into function
343
- + http: refactor finish_http_pack_request()
344
- + http: use --stdin when indexing dumb HTTP pack
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
346
- The "fetch/clone" protocol has been updated to allow the server to
347
- instruct the clients to grab pre-packaged packfile(s) in addition
348
- to the packed object data coming over the wire.
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
+
387
+* bc/sha-256-cvs-svn-updates (2020-06-22) 14 commits
388
+ (merged to 'next' on 2020-06-25 at e0d1c87fcf)
389
+ + git-cvsexportcommit: port to SHA-256
390
+ + git-cvsimport: port to SHA-256
391
+ + git-cvsserver: port to SHA-256
392
+ + git-svn: set the OID length based on hash algorithm
393
+ + perl: make SVN code hash independent
394
+ + perl: make Git::IndexInfo work with SHA-256
395
+ + perl: create and switch variables for hash constants
396
+ + t/lib-git-svn: make hash size independent
397
+ + t9101: make hash independent
398
+ + t9104: make hash size independent
399
+ + t9100: make test work with SHA-256
400
+ + t9108: make test hash independent
401
+ + t9168: make test hash independent
402
+ + t9109: make test hash independent
403
+ (this branch uses bc/sha-256-part-2.)
404
+
405
+ CVS/SVN interface have been prepared for SHA-256 transition
406
+
407
+ Will merge to 'master'.
408
+
409
+
410
+* ds/commit-graph-bloom-updates (2020-06-23) 11 commits
411
+ - bloom: enforce a minimum size of 8 bytes
412
+ - commit-graph: check all leading directories in changed path Bloom filters
413
+ - revision: empty pathspecs should not use Bloom filters
414
+ - revision.c: fix whitespace
415
+ - commit-graph: check chunk sizes after writing
416
+ - commit-graph: simplify chunk writes into loop
417
+ - commit-graph: unify the signatures of all write_graph_chunk_*() functions
418
+ - commit-graph: persist existence of changed-paths
419
+ - bloom: get_bloom_filter() cleanups
420
+ - commit-graph: change test to die on parse, not load
421
+ - commit-graph: place bloom_settings in context
422
+ (this branch uses sg/commit-graph-cleanups.)
423
+
424
+ Updates to the changed-paths bloom filter.
425
+
426
+ Expecting a reroll. Saw a lot of good review exchanges.
427
+ cf. <4b08360d-04ab-b614-196b-76124f1d54ef@gmail.com>
428
+
429
+
430
+* es/get-worktrees-unsort (2020-06-22) 2 commits
431
+ (merged to 'next' on 2020-06-25 at 732d93a36d)
432
+ + worktree: drop get_worktrees() unused 'flags' argument
433
+ + worktree: drop get_worktrees() special-purpose sorting option
434
+
435
+ API cleanup for get_worktrees()
436
+
437
+ Will merge to 'master'.
438
+
439
+
440
+* jl/complete-git-prune (2020-06-22) 1 commit
441
+ (merged to 'next' on 2020-06-25 at 64f30b8b41)
442
+ + bash-completion: add git-prune into bash completion
443
+
444
+ Add "git prune" to the completion (in contrib/), which could be
445
+ typed by end-users from the command line.
446
+
447
+ Will merge to 'master'.
448
+
449
+
450
+* js/default-branch-name (2020-06-24) 9 commits
451
+ (merged to 'next' on 2020-06-25 at 8f962f9219)
452
+ + testsvn: respect `init.defaultBranch`
453
+ + remote: use the configured default branch name when appropriate
454
+ + clone: use configured default branch name when appropriate
455
+ + init: allow setting the default for the initial branch name via the config
456
+ + init: allow specifying the initial branch name for the new repository
457
+ + docs: add missing diamond brackets
458
+ + submodule: fall back to remote's HEAD for missing remote.<name>.branch
459
+ + send-pack/transport-helper: avoid mentioning a particular branch
460
+ + fmt-merge-msg: stop treating `master` specially
461
+
462
+ The name of the primary branch in existing repositories, and the
463
+ default name used for the first branch in newly created
464
+ repositories, is made configurable, so that we can eventually wean
465
+ ourselves off of the hardcoded 'master'.
466
467
Will merge to 'master'.
468
@@ -362,64 +479,32 @@ repositories listed at
479
480
CMake support to build with MSVC for Windows bypassing the Makefile.
481
482
+ Expecting a reroll.
483
Almost there.
484
485
486
* ak/commit-graph-to-slab (2020-06-17) 4 commits
369
- - commit-graph: minimize commit_graph_data_slab access
370
- - commit: move members graph_pos, generation to a slab
371
- - commit-graph: introduce commit_graph_data_slab
372
- - object: drop parsed_object_pool->commit_count
487
+ (merged to 'next' on 2020-06-25 at 9a10ae18d3)
488
+ + commit-graph: minimize commit_graph_data_slab access
489
+ + commit: move members graph_pos, generation to a slab
490
+ + commit-graph: introduce commit_graph_data_slab
491
+ + object: drop parsed_object_pool->commit_count
492
493
A few fields in "struct commit" that do not have to always be
494
present have been moved to commit slabs.
495
377
-
378
-* en/clean-cleanups (2020-06-12) 4 commits
379
- (merged to 'next' on 2020-06-17 at 2c4ec990a6)
380
- + clean: optimize and document cases where we recurse into subdirectories
381
- + clean: consolidate handling of ignored parameters
382
- + dir, clean: avoid disallowed behavior
383
- + dir: fix a few confusing comments
384
-
385
- "git clean" code clean-up that resulted in a fix of recent
386
- performance regression.
387
-
388
- Will merge to 'master'.
389
-
390
-
391
-* dl/branch-cleanup (2020-06-17) 3 commits
392
- (merged to 'next' on 2020-06-18 at 76e151342c)
393
- + branch: don't mix --edit-description
394
- + t3200: test for specific errors
395
- + t3200: rename "expected" to "expect"
396
-
397
- Code clean-up around "git branch" with a minor bugfix.
398
-
399
- Will merge to 'master'.
400
-
401
-
402
-* ds/merge-base-is-ancestor-optim (2020-06-17) 2 commits
403
- (merged to 'next' on 2020-06-18 at 86b34a3688)
404
- + commit-reach: use fast logic in repo_in_merge_base
405
- + commit-reach: create repo_is_descendant_of()
406
-
407
- "git merge-base --is-ancestor" is taught to take advantage of the
408
- commit graph.
409
-
496
Will merge to 'master'.
497
498
413
-* dl/test-must-fail-fixes-5 (2020-06-18) 4 commits
414
- - lib-submodule-update: use callbacks in test_submodule_switch_common()
499
+* 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
504
505
The effort to avoid using test_must_fail on non-git command continues.
506
421
- Getting very close.
422
- cf. <20200618181533.GA633383@coredump.intra.peff.net>
507
+ Will merge to 'next'.
508
509
510
* sg/commit-graph-cleanups (2020-06-08) 10 commits
@@ -438,6 +523,8 @@ repositories listed at
523
The changed-path Bloom filter is improved using ideas from an
524
independent implementation.
525
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)
@@ -456,42 +543,6 @@ repositories listed at
543
Will merge to 'master'.
544
545
459
-* jk/complete-git-switch (2020-05-28) 16 commits
460
- (merged to 'next' on 2020-06-17 at 5b31140c0a)
461
- + completion: improve handling of --orphan option of switch/checkout
462
- + completion: improve handling of -c/-C and -b/-B in switch/checkout
463
- + completion: improve handling of --track in switch/checkout
464
- + completion: improve handling of --detach in checkout
465
- + completion: improve completion for git switch with no options
466
- + completion: improve handling of DWIM mode for switch/checkout
467
- + completion: perform DWIM logic directly in __git_complete_refs
468
- + completion: extract function __git_dwim_remote_heads
469
- + completion: replace overloaded track term for __git_complete_refs
470
- + completion: add tests showing subpar switch/checkout --orphan logic
471
- + completion: add tests showing subpar -c/C argument completion
472
- + completion: add tests showing subpar -c/-C startpoint completion
473
- + completion: add tests showing subpar switch/checkout --track logic
474
- + completion: add tests showing subar checkout --detach logic
475
- + completion: add tests showing subpar DWIM logic for switch/checkout
476
- + completion: add test showing subpar git switch completion
477
-
478
- The command line completion (in contrib/) learned to complete
479
- options that the "git switch" command takes.
480
-
481
- Will merge to 'master'.
482
-
483
-
484
-* ss/submodule-set-branch-in-c (2020-06-02) 1 commit
485
- (merged to 'next' on 2020-06-18 at 8880b35c5a)
486
- + submodule: port subcommand 'set-branch' from shell to C
487
-
488
- Rewrite of parts of the scripted "git submodule" Porcelain command
489
- continues; this time it is "git submodule set-branch" subcommand's
490
- turn.
491
-
492
- Will merge to 'master'.
493
-
494
-
546
* es/config-hooks (2020-05-21) 4 commits
547
- hook: add --porcelain to list command
548
- hook: add list command
@@ -500,7 +551,7 @@ repositories listed at
551
552
The "hooks defined in config" topic.
553
503
- Ready???
554
+ What's the status of this one? Abandoned?
555
556
557
* pw/rebase-i-more-options (2020-05-27) 5 commits
@@ -512,7 +563,7 @@ repositories listed at
563
564
"git rebase -i" learns a bit more options.
565
515
- Not quite.
566
+ Expecting a reroll.
567
cf. <nycvar.QRO.7.76.6.2005290437350.56@tvgsbejvaqbjf.bet>
568
569