What's cooking (2020/09 #08)
Junio C Hamano committed
Sep 29, 2020 at 14:54 UTC
cfbed5d1adeaed5a224ba0ea94fbe083a44f8e2d
1 file changed
+251
-234
whats-cooking.txt
+251
-234
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2020, #07; Fri, 25)
4
-X-master-at: 9bc233ae1cf19a49e51842c7959d80a675dbd1c0
5
-X-next-at: 665beee440013dbe19c071d4645a0311b5a18ec2
3
+Subject: What's cooking in git.git (Sep 2020, #08; Tue, 29)
4
+X-master-at: 306ee63a703ad67c54ba1209dc11dd9ea500dc1f
5
+X-next-at: fda3e449589e6e1698cd98ab4cab9214fe925eec
6
7
-What's cooking in git.git (Sep 2020, #07; Fri, 25)
7
+What's cooking in git.git (Sep 2020, #08; Tue, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -20,96 +20,233 @@ repositories listed at
20
--------------------------------------------------
21
[Graduated to 'master']
22
23
-* ds/maintenance-part-1 (2020-09-17) 11 commits
24
- (merged to 'next' on 2020-09-18 at 4c367d3cf6)
25
- + maintenance: add trace2 regions for task execution
26
- + maintenance: add auto condition for commit-graph task
27
- + maintenance: use pointers to check --auto
28
- + maintenance: create maintenance.<task>.enabled config
29
- + maintenance: take a lock on the objects directory
30
- + maintenance: add --task option
31
- + maintenance: add commit-graph task
32
- + maintenance: initialize task array
33
- + maintenance: replace run_auto_gc()
34
- + maintenance: add --quiet option
35
- + maintenance: create basic maintenance runner
36
- (this branch is used by ds/maintenance-part-2 and ds/maintenance-part-3.)
23
+* ah/pull (2020-09-24) 1 commit
24
+ (merged to 'next' on 2020-09-25 at b5ddf0cf8b)
25
+ + pull: don't warn if pull.ff has been set
26
38
- A "git gc"'s big brother has been introduced to take care of more
39
- repository maintenance tasks, not limited to the object database
40
- cleaning.
27
+ Earlier we taught "git pull" to warn when the user does not say the
28
+ histories need to be merged, rebased or accepts only fast-
29
+ forwarding, but the warning triggered for those who have set the
30
+ pull.ff configuration variable.
31
32
43
-* hx/push-atomic-with-cert (2020-09-19) 1 commit
44
- (merged to 'next' on 2020-09-22 at 64561eea5b)
45
- + send-pack: run GPG after atomic push checking
33
+* bc/clone-with-git-default-hash-fix (2020-09-22) 1 commit
34
+ (merged to 'next' on 2020-09-22 at 62ea45c20e)
35
+ + builtin/clone: avoid failure with GIT_DEFAULT_HASH
36
47
- "git push" that wants to be atomic and wants to send push
48
- certificate learned not to prepare and sign the push certificate
49
- when it fails the local check (hence due to atomicity it is known
50
- that no certificate is needed).
37
+ "git clone" that clones from SHA-1 repository, while
38
+ GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
39
+ unusable repository that half-claims to be SHA-256 repository
40
+ with SHA-1 objects and refs. This has been corrected.
41
42
53
-* jk/diff-highlight-blank-match-fix (2020-09-21) 1 commit
54
- (merged to 'next' on 2020-09-22 at 03ac708501)
55
- + diff-highlight: correctly match blank lines for flush
43
+* bc/faq-misc (2020-09-20) 3 commits
44
+ (merged to 'next' on 2020-09-22 at a81b728010)
45
+ + docs: explain how to deal with files that are always modified
46
+ + docs: explain why reverts are not always applied on merge
47
+ + docs: explain why squash merges are broken with long-running branches
48
+
49
+ More FAQ entries.
50
+
51
+
52
+* dl/zero-oid-in-hooks (2020-09-23) 3 commits
53
+ (merged to 'next' on 2020-09-25 at 3c7d03d61a)
54
+ + hooks--update.sample: use hash-agnostic zero OID
55
+ + hooks--pre-push.sample: use hash-agnostic zero OID
56
+ + hooks--pre-push.sample: modernize script
57
+
58
+ Adjust sample hooks for hash algorithm other than SHA-1.
59
57
- "diff-highlight" (in contrib/) had a logic to flush its output upon
58
- seeing a blank line but the way it detected a blank line was broken.
60
61
+* jc/t1506-rev-parse-leaves-range-endpoint-unpeeled (2020-09-25) 1 commit
62
+ (merged to 'next' on 2020-09-25 at e5233774ba)
63
+ + t1506: rev-parse A..B and A...B
64
61
-* jx/proc-receive-hook (2020-08-27) 10 commits
62
- (merged to 'next' on 2020-09-18 at 344c89be7e)
63
- + doc: add documentation for the proc-receive hook
64
- + transport: parse report options for tracking refs
65
- + t5411: test updates of remote-tracking branches
66
- + receive-pack: new config receive.procReceiveRefs
67
- + doc: add document for capability report-status-v2
68
- + New capability "report-status-v2" for git-push
69
- + receive-pack: feed report options to post-receive
70
- + receive-pack: add new proc-receive hook
71
- + t5411: add basic test cases for proc-receive hook
72
- + transport: not report a non-head push as a branch
65
+ Test update.
66
+
67
+
68
+* jk/make-protocol-v2-the-default (2020-09-25) 1 commit
69
+ (merged to 'next' on 2020-09-25 at 21a5f9e880)
70
+ + protocol: re-enable v2 protocol by default
71
74
- "git receive-pack" that accepts requests by "git push" learned to
75
- outsource most of the ref updates to the new "proc-receive" hook.
72
+ The transport protocol v2 has become the default again.
73
74
78
-* ld/p4-unshelve-fix (2020-09-19) 2 commits
79
- (merged to 'next' on 2020-09-22 at c7709a34ec)
80
- + git-p4: use HEAD~$n to find parent commit for unshelve
81
- + git-p4 unshelve: adding a commit breaks git-p4 unshelve
75
+* tb/bloom-improvements (2020-09-18) 13 commits
76
+ (merged to 'next' on 2020-09-22 at 520d531ad8)
77
+ + commit-graph: introduce 'commitGraph.maxNewFilters'
78
+ + builtin/commit-graph.c: introduce '--max-new-filters=<n>'
79
+ + commit-graph: rename 'split_commit_graph_opts'
80
+ + bloom: encode out-of-bounds filters as non-empty
81
+ + bloom/diff: properly short-circuit on max_changes
82
+ + bloom: use provided 'struct bloom_filter_settings'
83
+ + bloom: split 'get_bloom_filter()' in two
84
+ + commit-graph.c: store maximum changed paths
85
+ + commit-graph: respect 'commitGraph.readChangedPaths'
86
+ + t/helper/test-read-graph.c: prepare repo settings
87
+ + commit-graph: pass a 'struct repository *' in more places
88
+ + t4216: use an '&&'-chain
89
+ + commit-graph: introduce 'get_bloom_filter_settings()'
90
83
- The "unshelve" subcommand of "git p4" used incorrectly used
84
- commit^N where it meant to say commit~N to name the Nth generation
85
- ancestor, which has been corrected.
91
+ "git commit-graph write" learned to limit the number of bloom
92
+ filters that are computed from scratch with the --max-new-filters
93
+ option.
94
95
88
-* rs/misc-cleanups (2020-09-19) 1 commit
89
- (merged to 'next' on 2020-09-22 at d034fbfab0)
90
- + pack-write: use hashwrite_be32() in write_idx_file()
96
+* tg/range-diff-same-file-fix (2020-09-24) 1 commit
97
+ (merged to 'next' on 2020-09-25 at c2078e5505)
98
+ + diff: fix modified lines stats with --stat and --numstat
99
92
- Code cleanup.
100
+ "git range-diff" showed incorrect diffstat, which has been
101
+ corrected.
102
103
--------------------------------------------------
104
[New Topics]
105
97
-* cc/bisect-start-fix (2020-09-25) 1 commit
98
- - bisect: don't use invalid oid as rev when starting
106
+* al/ref-filter-merged-and-no-merged (2020-09-26) 1 commit
107
+ (merged to 'next' on 2020-09-29 at 748a286753)
108
+ + ref-filter: plug memory leak in reach_filter()
109
+
110
+ Hotfix.
111
+
112
+ Will merge to 'master'.
113
+
114
+
115
+* au/complete-restore-s (2020-09-26) 2 commits
116
+ (merged to 'next' on 2020-09-29 at 7bbf508562)
117
+ + completion: complete refs after 'git restore -s'
118
+ + completion: use "prev" variable instead of introducing "prevword"
119
+
120
+ The command line completion (in contrib/) learned that "git restore
121
+ -s <TAB>" is often followed by a refname.
122
+
123
+ Will merge to 'master'.
124
100
- "git bisect start X Y", when X and Y are not valid committish
101
- object names, should take X and Y as pathspec, but didn't.
125
+
126
+* eg/mailinfo-doc-scissors (2020-09-28) 1 commit
127
+ (merged to 'next' on 2020-09-29 at 4694f22fe9)
128
+ + Doc: show example scissors line
129
+
130
+ The explanation of the "scissors line" has been clarified.
131
+
132
+ Will merge to 'master'.
133
+
134
+
135
+* jc/fmt-merge-msg-suppress-destination (2020-09-27) 1 commit
136
+ (merged to 'next' on 2020-09-29 at 2b1f8ee654)
137
+ + config/fmt-merge-msg.txt: drop space in quote
138
+
139
+ Docfix.
140
+
141
+ Will merge to 'master'.
142
+
143
+
144
+* jk/format-auto-base-when-able (2020-09-26) 1 commit
145
+ - format-patch: teach format.useAutoBase "whenAble" option
146
+
147
+ "git format-patch" learns to take "if-able" as a possible value for
148
+ its "--base" option, and "whenAble" as a possible value for the
149
+ format.useAutoBase configuration variable to become no-op when the
150
+ automatically computed base does not make sense.
151
+
152
+
153
+* ma/worktree-cleanups (2020-09-27) 7 commits
154
+ - worktree: use skip_prefix to parse target
155
+ - worktree: rename copy-pasted variable
156
+ - worktree: update renamed variable in comment
157
+ - worktree: inline `worktree_ref()` into its only caller
158
+ - wt-status: introduce wt_status_state_free_buffers()
159
+ - wt-status: print to s->fp, not stdout
160
+ - wt-status: replace sha1 mentions with oid
161
+
162
+ Code clean-up.
163
164
Will merge to 'next'.
165
166
106
-* dl/zero-oid-in-hooks (2020-09-23) 3 commits
107
- (merged to 'next' on 2020-09-25 at 3c7d03d61a)
108
- + hooks--update.sample: use hash-agnostic zero OID
109
- + hooks--pre-push.sample: use hash-agnostic zero OID
110
- + hooks--pre-push.sample: modernize script
167
+* mt/delta-base-cache-races (2020-09-28) 2 commits
168
+ (merged to 'next' on 2020-09-29 at ee2d60c077)
169
+ + packfile: fix memory leak in add_delta_base_cache()
170
+ + packfile: fix race condition on unpack_entry()
171
112
- Adjust sample hooks for hash algorithm other than SHA-1.
172
+ A race that leads to an access to a free'd data was corrected in
173
+ the codepath that reads pack files.
174
+
175
+ Will merge to 'master'.
176
+
177
+
178
+* nl/credential-crlf (2020-09-28) 3 commits
179
+ - docs: make notes regarding credential line reading
180
+ - credentials: make line reading Windows compatible
181
+ - credential.c: fix credential reading with regards to CR/LF
182
+
183
+ cf. <pull.710.v2.git.git.1601293224.gitgitgadget@gmail.com>
184
+
185
+
186
+* tb/upload-pack-filters (2020-09-27) 1 commit
187
+ (merged to 'next' on 2020-09-29 at 3dde767170)
188
+ + config/uploadpack.txt: fix typo in `--filter=tree:<n>`
189
+
190
+ Hotfix.
191
+
192
+ Will merge to 'master'.
193
+
194
+
195
+* so/combine-diff-simplify (2020-09-29) 1 commit
196
+ - diff: get rid of redundant 'dense' argument
197
+
198
+--------------------------------------------------
199
+[Stalled]
200
+
201
+* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
202
+ - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
203
+
204
+ Doc update.
205
+
206
+ Expecting a reroll.
207
+ cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
208
+ cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
209
+
210
+
211
+* jc/war-on-dashed-git (2020-08-27) 1 commit
212
+ - git: catch an attempt to run "git-foo"
213
+
214
+ The first step to remove on-disk binaries for built-in subcommands
215
+ by soliciting objections.
216
+
217
+ On hold for now.
218
+
219
+
220
+* dr/push-remoteref-fix (2020-04-23) 1 commit
221
+ - remote.c: fix handling of %(push:remoteref)
222
+
223
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
224
+ "git format-patch" (and friends) only showed what got explicitly
225
+ configured, not what ref at the receiving end would be updated when
226
+ "git push" was used, as it ignored the default behaviour (e.g. update
227
+ the same ref as the source).
228
+
229
+ Discard for now.
230
+ cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
231
+ cf. <20200911214358.acl3hy2e763begoo@feanor>
232
+
233
+
234
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
235
+ - zlib.c: use size_t for size
236
+
237
+ The wrapper to call into zlib followed our long tradition to use
238
+ "unsigned long" for sizes of regions in memory, which have been
239
+ updated to use "size_t".
240
+
241
+--------------------------------------------------
242
+[Cooking]
243
+
244
+* cc/bisect-start-fix (2020-09-25) 1 commit
245
+ (merged to 'next' on 2020-09-29 at 637011d04a)
246
+ + bisect: don't use invalid oid as rev when starting
247
+
248
+ "git bisect start X Y", when X and Y are not valid committish
249
+ object names, should take X and Y as pathspec, but didn't.
250
251
Will merge to 'master'.
252
@@ -139,79 +276,52 @@ repositories listed at
276
277
278
* jk/drop-unaligned-loads (2020-09-24) 2 commits
142
- - Revert "fast-export: use local array to store anonymized oid"
143
- - bswap.h: drop unaligned loads
279
+ (merged to 'next' on 2020-09-29 at 29c05387a0)
280
+ + Revert "fast-export: use local array to store anonymized oid"
281
+ + bswap.h: drop unaligned loads
282
283
Compilation fix around type punning.
284
147
- Will merge to 'next'.
148
-
149
-
150
-* tg/range-diff-same-file-fix (2020-09-24) 1 commit
151
- (merged to 'next' on 2020-09-25 at c2078e5505)
152
- + diff: fix modified lines stats with --stat and --numstat
153
-
154
- "git range-diff" showed incorrect diffstat, which has been
155
- corrected.
156
-
157
- Will merge to 'master'.
158
-
159
-
160
-* ah/pull (2020-09-24) 1 commit
161
- (merged to 'next' on 2020-09-25 at b5ddf0cf8b)
162
- + pull: don't warn if pull.ff has been set
163
-
164
- Earlier we taught "git pull" to warn when the user does not say the
165
- histories need to be merged, rebased or accepts only fast-
166
- forwarding, but the warning triggered for those who have set the
167
- pull.ff configuration variable.
168
-
285
Will merge to 'master'.
286
287
288
* jc/blame-ignore-fix (2020-09-24) 2 commits
173
- - blame: validate and peel the object names on the ignore list
174
- - t8013: minimum preparatory clean-up
289
+ (merged to 'next' on 2020-09-29 at 96fbdb57fb)
290
+ + blame: validate and peel the object names on the ignore list
291
+ + t8013: minimum preparatory clean-up
292
293
"git blame --ignore-rev/--ignore-revs-file" failed to validate
294
their input are valid revision, and failed to take into account
295
that the user may want to give an annotated tag instead of a
296
commit, which has been corrected.
297
181
- Will merge to 'next'.
182
-
183
-
184
-* jk/make-protocol-v2-the-default (2020-09-25) 1 commit
185
- (merged to 'next' on 2020-09-25 at 21a5f9e880)
186
- + protocol: re-enable v2 protocol by default
187
-
188
- The transport protocol v2 has become the default again.
189
-
298
Will merge to 'master'.
299
300
193
-* jk/shortlog-group-by-trailer (2020-09-25) 8 commits
194
- - shortlog: allow multiple groups to be specified
195
- - shortlog: parse trailer idents
196
- - shortlog: rename parse_stdin_ident()
197
- - shortlog: de-duplicate trailer values
198
- - shortlog: match commit trailers with --group
199
- - trailer: add interface for iterating over commit trailers
200
- - shortlog: refactor committer/author grouping
201
- - shortlog: change "author" variables to "ident"
301
+* jk/shortlog-group-by-trailer (2020-09-27) 8 commits
302
+ (merged to 'next' on 2020-09-29 at 3706b06db5)
303
+ + shortlog: allow multiple groups to be specified
304
+ + shortlog: parse trailer idents
305
+ + shortlog: rename parse_stdin_ident()
306
+ + shortlog: de-duplicate trailer values
307
+ + shortlog: match commit trailers with --group
308
+ + trailer: add interface for iterating over commit trailers
309
+ + shortlog: add grouping option
310
+ + shortlog: change "author" variables to "ident"
311
312
"git shortlog" has been taught to group commits by the contents of
313
the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
314
206
- Will merge to 'next'.
315
+ Will merge to 'master'.
316
317
209
-* js/cmake-vs (2020-09-25) 10 commits
210
- - hashmap_for_each_entry(): work around MSVC's run-time check failure #3
318
+* js/cmake-vs (2020-09-28) 11 commits
319
+ - cmake: fix typo in message when `msgfmt` was not found
320
+ - hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
321
- cmake (Windows): recommend using Visual Studio's built-in CMake support
322
- cmake (Windows): initialize vcpkg/build dependencies automatically
323
- cmake (Windows): complain when encountering an unknown compiler
214
- - cmake (Windows): let the `.dll` files are found when running the tests
324
+ - cmake (Windows): let the `.dll` files be found when running the tests
325
- cmake: quote the path accurately when editing `test-lib.sh`
326
- cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
327
- cmake: ensure that the `vcpkg` packages are found on Windows
@@ -222,10 +332,9 @@ repositories listed at
332
Studio build revealed there were lot of usability improvements
333
possible, which have been carried out.
334
225
- Expecting a reroll.
226
- cf. <CAKiG+9V=BGX4k_dM-5JzYmko0cZfYXuSxEk5-UuHZpAqaWoU_A@mail.gmail.com>
227
- cf. <CAPig+cTPi1yi7WQf_eWa+bFRJEdtULFO3yYqJh3nm=_CtEe6CQ@mail.gmail.com>
228
- cf. <xmqq8scxln10.fsf@gitster.c.googlers.com>
335
+ Expecting a (hopefully) final reroll.
336
+ cf. <nycvar.QRO.7.76.6.2009291406310.50@tvgsbejvaqbjf.bet>
337
+ cf. <nycvar.QRO.7.76.6.2009291407130.50@tvgsbejvaqbjf.bet>
338
339
340
* sv/t7001-modernize (2020-09-25) 11 commits
@@ -248,64 +357,14 @@ repositories listed at
357
358
359
* jc/sequencer-stopped-sha-simplify (2020-09-25) 1 commit
251
- - sequencer: stop abbreviating stopped-sha file
252
-
360
+ (merged to 'next' on 2020-09-29 at 9af3360572)
361
+ + sequencer: stop abbreviating stopped-sha file
362
254
-* jc/t1506-rev-parse-leaves-range-endpoint-unpeeled (2020-09-25) 1 commit
255
- (merged to 'next' on 2020-09-25 at e5233774ba)
256
- + t1506: rev-parse A..B and A...B
257
-
258
- Test update.
363
+ Code simplification.
364
365
Will merge to 'master'.
366
367
263
---------------------------------------------------
264
-[Stalled]
265
-
266
-* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
267
- - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
268
-
269
- Doc update.
270
-
271
- Expecting a reroll.
272
- cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
273
- cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
274
-
275
-
276
-* jc/war-on-dashed-git (2020-08-27) 1 commit
277
- - git: catch an attempt to run "git-foo"
278
-
279
- The first step to remove on-disk binaries for built-in subcommands
280
- by soliciting objections.
281
-
282
- On hold for now.
283
-
284
-
285
-* dr/push-remoteref-fix (2020-04-23) 1 commit
286
- - remote.c: fix handling of %(push:remoteref)
287
-
288
- The "%(push:remoteref)" placeholder in the "--format=" argument of
289
- "git format-patch" (and friends) only showed what got explicitly
290
- configured, not what ref at the receiving end would be updated when
291
- "git push" was used, as it ignored the default behaviour (e.g. update
292
- the same ref as the source).
293
-
294
- Discard for now.
295
- cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
296
- cf. <20200911214358.acl3hy2e763begoo@feanor>
297
-
298
-
299
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
300
- - zlib.c: use size_t for size
301
-
302
- The wrapper to call into zlib followed our long tradition to use
303
- "unsigned long" for sizes of regions in memory, which have been
304
- updated to use "size_t".
305
-
306
---------------------------------------------------
307
-[Cooking]
308
-
368
* rs/archive-add-file (2020-09-19) 3 commits
369
- Makefile: use git-archive --add-file
370
- archive: add --add-file
@@ -315,7 +374,7 @@ repositories listed at
374
files into a snapshot from a tree-ish.
375
376
318
-* js/default-branch-name-part-2 (2020-09-21) 5 commits
377
+* js/default-branch-name-part-2 (2020-09-26) 5 commits
378
- t9902: avoid using the branch name `master`
379
- tests: avoid variations of the `master` branch name
380
- t3200: avoid variations of the `master` branch name
@@ -325,7 +384,7 @@ repositories listed at
384
Update the tests to drop word 'master' from them
385
386
328
-* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-21) 2 commits
387
+* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-28) 2 commits
388
- fetch: do not override partial clone filter
389
- promisor-remote: remove unused variable
390
@@ -353,21 +412,13 @@ repositories listed at
412
cf. <xmqqblhyepup.fsf@gitster.c.googlers.com>
413
414
356
-* bc/faq-misc (2020-09-20) 3 commits
357
- (merged to 'next' on 2020-09-22 at a81b728010)
358
- + docs: explain how to deal with files that are always modified
359
- + docs: explain why reverts are not always applied on merge
360
- + docs: explain why squash merges are broken with long-running branches
361
-
362
- More FAQ entries.
363
-
364
- Will merge to 'master'.
365
-
366
-
367
-* sb/clone-origin (2020-09-11) 4 commits
415
+* sb/clone-origin (2020-09-29) 7 commits
416
- clone: allow configurable default for `-o`/`--origin`
417
+ - clone: read new remote name from remote_name instead of option_origin
418
- clone: validate --origin option before use
370
- - clone: call git_config before parse_options
419
+ - refs: consolidate remote name validation
420
+ - remote: add tests for add and rename with invalid names
421
+ - clone: use more conventional config/option layering
422
- clone: add tests for --template and some disallowed option pairs
423
424
"git clone" learned clone.defaultremotename configuration variable
@@ -377,7 +428,8 @@ repositories listed at
428
Expecting an update.
429
430
380
-* sk/force-if-includes (2020-09-23) 3 commits
431
+* sk/force-if-includes (2020-09-27) 4 commits
432
+ - SQUASH??? name an array in singular and avoid commenting obvious
433
- t, doc: update tests, reference for "--force-if-includes"
434
- push: parse and set flag for "--force-if-includes"
435
- push: add reflog check for "--force-if-includes"
@@ -388,8 +440,8 @@ repositories listed at
440
being force-pushed was created after examining the commit at the
441
tip of the remote ref that is about to be force-replaced.
442
391
- Expecting a reroll.
392
- cf. <20200923112606.GA71705@mail.clickyotomy.dev>
443
+ On hold.
444
+ Seems to trigger gotchas in the reachability logic in commit-graph.
445
446
447
* ab/mediawiki-fixes (2020-09-21) 18 commits
@@ -426,18 +478,6 @@ repositories listed at
478
Needs more work.
479
480
429
-* bc/clone-with-git-default-hash-fix (2020-09-22) 1 commit
430
- (merged to 'next' on 2020-09-22 at 62ea45c20e)
431
- + builtin/clone: avoid failure with GIT_DEFAULT_HASH
432
-
433
- "git clone" that clones from SHA-1 repository, while
434
- GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
435
- unusable repository that half-claims to be SHA-256 repository
436
- with SHA-1 objects and refs. This has been corrected.
437
-
438
- Will merge to 'master'.
439
-
440
-
481
* hn/reftable (2020-09-22) 14 commits
482
- reftable: fix some sparse warnings
483
- reftable: "test-tool dump-reftable" command.
@@ -479,29 +519,6 @@ repositories listed at
519
other scheduling system configuration) for it.
520
521
482
-* tb/bloom-improvements (2020-09-18) 13 commits
483
- (merged to 'next' on 2020-09-22 at 520d531ad8)
484
- + commit-graph: introduce 'commitGraph.maxNewFilters'
485
- + builtin/commit-graph.c: introduce '--max-new-filters=<n>'
486
- + commit-graph: rename 'split_commit_graph_opts'
487
- + bloom: encode out-of-bounds filters as non-empty
488
- + bloom/diff: properly short-circuit on max_changes
489
- + bloom: use provided 'struct bloom_filter_settings'
490
- + bloom: split 'get_bloom_filter()' in two
491
- + commit-graph.c: store maximum changed paths
492
- + commit-graph: respect 'commitGraph.readChangedPaths'
493
- + t/helper/test-read-graph.c: prepare repo settings
494
- + commit-graph: pass a 'struct repository *' in more places
495
- + t4216: use an '&&'-chain
496
- + commit-graph: introduce 'get_bloom_filter_settings()'
497
-
498
- "git commit-graph write" learned to limit the number of bloom
499
- filters that are computed from scratch with the --max-new-filters
500
- option.
501
-
502
- Will merge to 'master'.
503
-
504
-
522
* es/config-hooks (2020-09-09) 9 commits
523
- run_commit_hook: take strvec instead of varargs
524
- commit: use config-based hooks
@@ -541,17 +558,17 @@ repositories listed at
558
559
560
* mr/bisect-in-c-2 (2020-09-24) 6 commits
544
- - bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
545
- - bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
546
- - bisect--helper: reimplement `bisect_autostart` shell function in C
547
- - bisect--helper: introduce new `write_in_file()` function
548
- - bisect--helper: use '-res' in 'cmd_bisect__helper' return
549
- - bisect--helper: BUG() in cmd_*() on invalid subcommand
561
+ (merged to 'next' on 2020-09-29 at a15f1729d2)
562
+ + bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
563
+ + bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
564
+ + bisect--helper: reimplement `bisect_autostart` shell function in C
565
+ + bisect--helper: introduce new `write_in_file()` function
566
+ + bisect--helper: use '-res' in 'cmd_bisect__helper' return
567
+ + bisect--helper: BUG() in cmd_*() on invalid subcommand
568
569
Rewrite of the "git bisect" script in C continues.
570
553
- Will merge to 'next'.
554
- At v9. Looking good so far.
571
+ Will merge to 'master'.
572
573
574
* js/no-builtins-on-disk-option (2020-09-21) 3 commits