What's cooking (2020/10 #04)
Junio C Hamano committed
Oct 27, 2020 at 16:33 UTC
1637c5d31a0b0df8e3dcef7072720fe0381520ac
1 file changed
+708
-380
whats-cooking.txt
+708
-380
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2020, #03; Mon, 19)
4
-X-master-at: 2a809eccbc6099183176b3c4760f857d09a50599
5
-X-next-at: 2f331ef7c587c4f07226542c52ca9977814df1a5
3
+Subject: What's cooking in git.git (Oct 2020, #04; Tue, 27)
4
+X-master-at: f9b6481aedae587b1380736fb8f21785119aeb48
5
+X-next-at: 6691a3f2fe6b2727a10cb93899847c6d6cd6ab69
6
7
-What's cooking in git.git (Oct 2020, #03; Mon, 19)
7
+What's cooking in git.git (Oct 2020, #04; Tue, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,10 +12,9 @@ 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
-Git 2.29 final has been tagged. We will hopefully either (1) not
16
-see brown-paper-bag breakages at all, or (2) will see some but can
17
-immediately deal with them, in coming couple of days. After that,
18
-the 2.30 cycle will gain steam, starting next week. Let's see.
15
+The first batch of topics in this cycle are merged to 'master', and
16
+the tip of 'next' has been rewound and rebuilt. A handful of new
17
+topics are also in 'next'.
18
19
Copies of the source code to Git live in many repositories, and the
20
following is a list of the ones I push into. Some repositories have
@@ -45,105 +44,630 @@ Release tarballs are available at:
44
https://www.kernel.org/pub/software/scm/git/
45
46
--------------------------------------------------
48
-[New Topics]
47
+[Graduated to 'master']
48
+
49
+* cc/doc-filter-branch-typofix (2020-10-20) 1 commit
50
+ (merged to 'next' on 2020-10-23 at fc3c91dbc4)
51
+ + filter-branch doc: fix filter-repo typo
52
+
53
+ Docfix.
54
+
55
56
* cw/ci-ghwf-check-ws-errors (2020-10-09) 1 commit
51
- (merged to 'next' on 2020-10-15 at 159e0f0277)
57
+ (merged to 'next' on 2020-10-26 at e7f8479a06)
58
+ ci: github action - add check for whitespace errors
59
60
+ Originally merged to 'next' on 2020-10-15
61
+
62
Dev support.
63
56
- Will cook in 'next'.
64
65
+* dl/checkout-guess (2020-10-08) 2 commits
66
+ (merged to 'next' on 2020-10-26 at ba63e6e268)
67
+ + checkout: learn to respect checkout.guess
68
+ + Documentation/config/checkout: replace sq with backticks
69
59
-* en/strmap (2020-10-13) 10 commits
60
- - strmap: enable allocations to come from a mem_pool
61
- - strmap: add a strset sub-type
62
- - strmap: add functions facilitating use as a string->int map
63
- - strmap: enable faster clearing and reusing of strmaps
64
- - strmap: add more utility functions
65
- - strmap: new utility functions
66
- - hashmap: introduce a new hashmap_partial_clear()
67
- - hashmap: allow re-use after hashmap_free()
68
- - hashmap: adjust spacing to fix argument alignment
69
- - hashmap: add usage documentation explaining hashmap_free[_entries]()
70
+ Originally merged to 'next' on 2020-10-08
71
71
- A speciailization of hashmap that uses a string as key has been
72
- introduced. Hopefully it will see wider use over time.
72
+ "git checkout" learned to use checkout.guess configuration variable
73
+ and enable/disable its "--[no-]guess" option accordingly.
74
74
- Will merge to 'next'.
75
76
+* dl/checkout-p-merge-base (2020-10-07) 4 commits
77
+ (merged to 'next' on 2020-10-26 at 1c401bcb0b)
78
+ + t2016: add a NEEDSWORK about the PERL prerequisite
79
+ + add-patch: add NEEDSWORK about comparing commits
80
+ + Doc: document "A...B" form for <tree-ish> in checkout and switch
81
+ + builtin/checkout: fix `git checkout -p HEAD...` bug
82
77
-* en/test-selector (2020-10-18) 3 commits
78
- - test-lib: reduce verbosity of skipped tests
79
- - t6006, t6012: adjust tests to use 'setup' instead of synonyms
80
- - test-lib: allow selecting tests by substring/glob with --run
83
+ Originally merged to 'next' on 2020-10-08
84
82
- Our test scripts can be told to run only individual pieces while
83
- skipping others with the "--run=..." option; they were taught to
84
- take a substring of test title, in addition to numbers, to name the
85
- test pices to run.
85
+ "git checkout -p A...B [-- <path>]" did not work, even though the
86
+ same command without "-p" correctly used the merge-base between
87
+ commits A and B.
88
87
- Will merge to 'next'.
89
90
+* ds/maintenance-part-2 (2020-09-25) 8 commits
91
+ (merged to 'next' on 2020-10-26 at 226ac6646d)
92
+ + maintenance: add incremental-repack auto condition
93
+ + maintenance: auto-size incremental-repack batch
94
+ + maintenance: add incremental-repack task
95
+ + midx: use start_delayed_progress()
96
+ + midx: enable core.multiPackIndex by default
97
+ + maintenance: create auto condition for loose-objects
98
+ + maintenance: add loose-objects task
99
+ + maintenance: add prefetch task
100
+ (this branch is used by ds/maintenance-part-3.)
101
90
-* jk/report-fn-typedef (2020-10-16) 1 commit
91
- - usage: define a type for a reporting function
102
+ Originally merged to 'next' on 2020-10-04
103
93
- Code clean-up.
104
+ "git maintenance", an extended big brother of "git gc", continues
105
+ to evolve.
106
95
- Needs to get its log message updated.
107
108
+* jk/committer-date-is-author-date-fix (2020-10-23) 3 commits
109
+ (merged to 'next' on 2020-10-23 at ee490e95b8)
110
+ + rebase: fix broken email with --committer-date-is-author-date
111
+ + am: fix broken email with --committer-date-is-author-date
112
+ + t3436: check --committer-date-is-author-date result more carefully
113
+ (this branch is used by jk/committer-date-is-author-date-fix-simplify.)
114
98
-* mr/bisect-in-c-3 (2020-10-16) 7 commits
99
- - bisect--helper: retire `--bisect-autostart` subcommand
100
- - bisect--helper: retire `--write-terms` subcommand
101
- - bisect--helper: retire `--check-expected-revs` subcommand
102
- - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
103
- - bisect--helper: retire `--next-all` subcommand
104
- - bisect--helper: retire `--bisect-clean-state` subcommand
105
- - bisect--helper: finish porting `bisect_start()` to C
115
+ In 2.29, "--committer-date-is-author-date" option of "rebase" and
116
+ "am" subcommands lost the e-mail address by mistake, which has been
117
+ corrected.
118
+
119
+
120
+* js/no-builtins-on-disk-option (2020-10-21) 1 commit
121
+ (merged to 'next' on 2020-10-22 at 88cec4a607)
122
+ + SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
123
+
124
+ Brown-paper-bag fix.
125
107
- Rewriting "git bisect" in C continues.
126
109
- How ready is this one?
127
+* js/userdiff-php (2020-10-07) 1 commit
128
+ (merged to 'next' on 2020-10-26 at 21dc182f78)
129
+ + userdiff: PHP: catch "abstract" and "final" functions
130
+
131
+ Originally merged to 'next' on 2020-10-08
132
+
133
+ Userdiff for PHP update.
134
+
135
+
136
+* kb/userdiff-rust-macro-rules (2020-10-07) 1 commit
137
+ (merged to 'next' on 2020-10-26 at 681f75320c)
138
+ + userdiff: recognize 'macro_rules!' as starting a Rust function block
139
+
140
+ Originally merged to 'next' on 2020-10-08
141
+
142
+ Userdiff for Rust update.
143
+
144
+
145
+* rk/completion-stash (2020-10-07) 2 commits
146
+ (merged to 'next' on 2020-10-26 at d694e89155)
147
+ + git-completion.bash: stash-show: complete $__git_diff_common_options
148
+ + git-completion.bash: __git_diff_common_options: add --[no-]patch
149
+
150
+ Originally merged to 'next' on 2020-10-08
151
+
152
+ The command line completion script (in contrib/) learned that "git
153
+ stash show" takes the options "git diff" takes.
154
155
156
* rs/dist-doc-with-git-archive (2020-10-12) 2 commits
113
- (merged to 'next' on 2020-10-15 at cb1029e046)
157
+ (merged to 'next' on 2020-10-26 at 1391e1ae82)
158
+ Makefile: remove the unused variable TAR_DIST_EXTRA_OPTS
159
+ Makefile: use git init/add/commit/archive for dist-doc
160
117
- Use "git archive" more to produce the release tarball.
161
+ Originally merged to 'next' on 2020-10-15
162
119
- Will cook in 'next'.
163
+ Use "git archive" more to produce the release tarball.
164
165
166
* rs/tighten-callers-of-deref-tag (2020-10-12) 3 commits
123
- (merged to 'next' on 2020-10-15 at a0df4a45cb)
167
+ (merged to 'next' on 2020-10-26 at b33d5986e5)
168
+ line-log: handle deref_tag() returning NULL
169
+ blame: handle deref_tag() returning NULL
170
+ grep: handle deref_tag() returning NULL
171
172
+ Originally merged to 'next' on 2020-10-15
173
+
174
+ Code clean-up.
175
+
176
+
177
+* rs/worktree-list-show-locked (2020-10-12) 1 commit
178
+ (merged to 'next' on 2020-10-26 at 398e14f216)
179
+ + worktree: teach `list` to annotate locked worktree
180
+
181
+ Originally merged to 'next' on 2020-10-15
182
+
183
+ "git worktree list" now shows if each worktree is locked. This
184
+ possibly may open us to show other kinds of states in the future.
185
+
186
+
187
+* sb/clone-origin (2020-09-30) 7 commits
188
+ (merged to 'next' on 2020-10-26 at 83fbb58da1)
189
+ + clone: allow configurable default for `-o`/`--origin`
190
+ + clone: read new remote name from remote_name instead of option_origin
191
+ + clone: validate --origin option before use
192
+ + refs: consolidate remote name validation
193
+ + remote: add tests for add and rename with invalid names
194
+ + clone: use more conventional config/option layering
195
+ + clone: add tests for --template and some disallowed option pairs
196
+
197
+ Originally merged to 'next' on 2020-10-06
198
+
199
+ "git clone" learned clone.defaultremotename configuration variable
200
+ to customize what nickname to use to call the remote the repository
201
+ was cloned from.
202
+
203
+
204
+* sd/userdiff-css-update (2020-10-08) 1 commit
205
+ (merged to 'next' on 2020-10-26 at 253e1d021b)
206
+ + userdiff: expand detected chunk headers for css
207
+
208
+ Originally merged to 'next' on 2020-10-08
209
+
210
+ Userdiff for CSS update.
211
+
212
+
213
+* sk/force-if-includes (2020-10-03) 4 commits
214
+ (merged to 'next' on 2020-10-26 at 648422f517)
215
+ + t, doc: update tests, reference for "--force-if-includes"
216
+ + push: parse and set flag for "--force-if-includes"
217
+ + push: add reflog check for "--force-if-includes"
218
+ + Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
219
+
220
+ Originally merged to 'next' on 2020-10-04
221
+
222
+ "git push --force-with-lease[=<ref>]" can easily be misused to lose
223
+ commits unless the user takes good care of their own "git fetch".
224
+ A new option "--force-if-includes" attempts to ensure that what is
225
+ being force-pushed was created after examining the commit at the
226
+ tip of the remote ref that is about to be force-replaced.
227
+
228
+--------------------------------------------------
229
+[New Topics]
230
+
231
+* cm/t7xxx-cleanup (2020-10-22) 6 commits
232
+ (merged to 'next' on 2020-10-26 at 8b58e54942)
233
+ + t7102: prepare expected output inside test_expect_* block
234
+ + t7201: put each command on a separate line
235
+ + t7201: use 'git -C' to avoid subshell
236
+ + t7102,t7201: remove whitespace after redirect operator
237
+ + t7102,t7201: remove unnecessary blank spaces in test body
238
+ + t7101,t7102,t7201: modernize test formatting
239
+
240
+ Originally merged to 'next' on 2020-10-23
241
+
242
+ Micro clean-up.
243
+
244
+ Will merge to 'master'.
245
+
246
+
247
+* js/avoid-split-sideband-message (2020-10-27) 3 commits
248
+ (merged to 'next' on 2020-10-27 at 06b2f75522)
249
+ + test-pkt-line: drop colon from sideband identity
250
+ (merged to 'next' on 2020-10-26 at 1b550f3245)
251
+ + sideband: report unhandled incomplete sideband messages as bugs
252
+ + sideband: avoid reporting incomplete sideband messages
253
+
254
+ The side-band status report can be sent at the same time as the
255
+ primary payload multiplexed, but the demultiplexer on the receiving
256
+ end incorrectly split a single status report into two, which has
257
+ been corrected.
258
+
259
+ Will merge to 'master'.
260
+
261
+
262
+* jt/apply-reverse-twice (2020-10-20) 1 commit
263
+ (merged to 'next' on 2020-10-26 at f060893eb7)
264
+ + apply: when -R, also reverse list of sections
265
+
266
+ "git apply -R" did not handle patches that touch the same path
267
+ twice correctly, which has been corrected. This is most relevant
268
+ in a patch that changes a path from a regular file to a symbolic
269
+ link (and vice versa).
270
+
271
+ Will merge to 'master'.
272
+
273
+
274
+* av/fsmonitor-cleanup (2020-10-21) 2 commits
275
+ - fsmonitor: make output of test-dump-fsmonitor more concise
276
+ - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
277
+
278
+ Code clean-up.
279
+
280
+ Unneeded?
281
+ cf. <20201022183822.GA781760@nand.local>
282
+
283
+
284
+* bc/svn-hash-oid-fix (2020-10-21) 1 commit
285
+ (merged to 'next' on 2020-10-26 at 743b549d5d)
286
+ + svn: use correct variable name for short OID
287
+
288
+ A recent oid->hash conversion missed one spot, breaking "git svn".
289
+
290
+ Will merge to 'master'.
291
+
292
+
293
+* en/sequencer-rollback-lock-cleanup (2020-10-21) 1 commit
294
+ (merged to 'next' on 2020-10-26 at 1234e8297f)
295
+ + sequencer: remove duplicate rollback_lock_file() call
296
+
297
+ Code clean-up.
298
+
299
+ Will merge to 'master'.
300
+
301
+
302
+* jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
303
+ - sequencer: tolerate abbreviated stopped-sha file
304
+
305
+ Recently the format of an internal state file "rebase -i" uses has
306
+ been tightened up for consistency, which would hurt those who start
307
+ "rebase -i" with old git and then continue with new git. Loosen
308
+ the reader side a bit (which we may want to tighten again in a year
309
+ or so).
310
+
311
+ Is this a real issue, or just a theoretical one?
312
+ cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
313
+
314
+
315
+* jk/perl-warning (2020-10-21) 1 commit
316
+ - perl: check for perl warnings while running tests
317
+
318
+ Dev support.
319
+
320
+ Will merge to 'next'.
321
+ cf. <20201022032400.GC1480820@coredump.intra.peff.net>
322
+
323
+
324
+* js/default-branch-name-part-4-minus-1 (2020-10-23) 9 commits
325
+ (merged to 'next' on 2020-10-26 at 0a66b76c66)
326
+ + t1400: prepare for `main` being default branch name
327
+ + tests: prepare aligned mentions of the default branch name
328
+ + t9902: prepare a test for the upcoming default branch name
329
+ + t3200: prepare for `main` being shorter than `master`
330
+ + t5703: adjust a test case for the upcoming default branch name
331
+ + t6200: adjust suppression pattern to also match "main"
332
+ + tests: start moving to a different default main branch name
333
+ + t9801: use `--` in preparation for default branch rename
334
+ + fmt-merge-msg: also suppress "into main" by default
335
+
336
+ Adjust tests so that they won't scream when the default initial
337
+ branch name is changed to 'main'.
338
+
339
+ Will merge to 'master'.
340
+
341
+
342
+* js/t7006-cleanup (2020-10-21) 1 commit
343
+ (merged to 'next' on 2020-10-26 at b8582f842d)
344
+ + t7006: Use test_path_is_* functions in test script
345
+
346
+ Code clean-up.
347
+
348
+ Will merge to 'master'.
349
+
350
+
351
+* pb/ref-filter-with-crlf (2020-10-22) 2 commits
352
+ - log, show: add tests for messages containing CRLF
353
+ - ref-filter: handle CRLF at end-of-line more gracefully
354
+
355
+ A commit and tag object may have CR at the end of each and
356
+ every line (you can create such an object with hash-object or
357
+ using --cleanup=verbatim to decline the default clean-up
358
+ action), but it would make it impossible to have a blank line
359
+ to separate the title from the body of the message. Be lenient
360
+ and accept a line with lone CR on it as a blank line, too.
361
+
362
+ Will merge to 'next'.
363
+
364
+
365
+* ve/userdiff-bash (2020-10-22) 1 commit
366
+ (merged to 'next' on 2020-10-26 at 2b34be98fe)
367
+ + userdiff: support Bash
368
+
369
+ The userdiff pattern learned to identify the function definition in
370
+ POSIX shells and bash.
371
+
372
+ Will merge to 'master'.
373
+
374
+
375
+* ab/git-remote-exit-code (2020-10-27) 1 commit
376
+ - remote: add meaningful exit code on missing/existing
377
+
378
+ Exit codes from "git remote add" etc. were not usable by scripted
379
+ callers.
380
+
381
+
382
+* en/merge-ort-api-null-impl (2020-10-26) 4 commits
383
+ - merge,rebase,revert: select ort or recursive by config or environment
384
+ - fast-rebase: demonstrate merge-ort's API via temporary/hidden command
385
+ - merge-ort-wrappers: new convience wrappers to mimic the old merge API
386
+ - merge-ort: barebones API of new merge strategy with empty implementation
387
+
388
+ Preparation for a new merge strategy.
389
+
390
+
391
+* en/merge-tests (2020-10-26) 9 commits
392
+ - t6423: add more details about direct resolution of directories
393
+ - t6423: note improved ort handling with untracked files
394
+ - t6423, t6436: note improved ort handling with dirty files
395
+ - merge tests: expect slight differences in output for recursive vs. ort
396
+ - t6423: expect improved conflict markers labels in the ort backend
397
+ - t6404, t6423: expect improved rename/delete handling in ort backend
398
+ - t6416: correct expectation for rename/rename(1to2) + directory/file
399
+ - merge tests: expect improved directory/file conflict handling in ort
400
+ - t/: new helper for tests that pass with ort but fail with recursive
401
+ (this branch uses en/dir-rename-tests.)
402
+
403
+ Preparation for a new merge strategy.
404
+
405
+
406
+* jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
407
+ - am, sequencer: stop parsing our own committer ident
408
+
409
+ Code symplification.
410
+
411
+
412
+* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
413
+ - diff: do not show submodule with untracked files as "-dirty"
414
+
415
+ "git diff" showed a submodule working tree with untracked cruft as
416
+ "Submodule commit <objectname>-dirty", but a natural expectation is
417
+ that the "-dirty" indicator would align with "git describe --dirty",
418
+ which does not consider having untracked files in the working tree
419
+ as source of dirtiness. The inconsistency has been fixed.
420
+
421
+ Needs doc update.
422
+
423
+
424
+* fc/zsh-completion (2020-10-26) 29 commits
425
+ - zsh: update copyright notices
426
+ - completion: bash: remove old compat wrappers
427
+ - completion: bash: cleanup cygwin check
428
+ - completion: bash: trivial cleanup
429
+ - completion: zsh: add simple version check
430
+ - completion: zsh: trivial simplification
431
+ - completion: zsh: add alias descriptions
432
+ - completion: zsh: improve command tags
433
+ - completion: zsh: refactor command completion
434
+ - completion: zsh: shuffle functions around
435
+ - completion: zsh: simplify file_direct
436
+ - completion: zsh: simplify nl_append
437
+ - completion: zsh: trivial cleanup
438
+ - completion: zsh: simplify direct compadd
439
+ - completion: zsh: simplify compadd functions
440
+ - completion: zsh: fix splitting of words
441
+ - completion: zsh: add missing direct_append
442
+ - completion: fix conflict with bashcomp
443
+ - completion: zsh: fix completion for --no-.. options
444
+ - completion: bash: remove zsh wrapper
445
+ - completion: bash: synchronize zsh wrapper
446
+ - completion: zsh: fix for command aliasing
447
+ - completion: prompt: fix color for Zsh
448
+ - completion: zsh: update slave script locations
449
+ - completion: zsh: fix for directories with spaces
450
+ - completion: zsh: reorganize install instructions
451
+ - completion: zsh: fix bash script extension
452
+ - completion: zsh: fix name due to broken autoloading
453
+ - completion: zsh: fix __gitcomp_direct()
454
+
455
+
456
+* jc/doc-final-resend (2020-10-26) 1 commit
457
+ - SubmittingPatches: clarify the purpose of the final resend
458
+
459
+
460
+* nk/perf-fsmonitor (2020-10-26) 10 commits
461
+ - t/perf/fsmonitor: add benchmark for dirty status
462
+ - t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
463
+ - t/perf/fsmonitor: initialize test with git reset
464
+ - t/perf/fsmonitor: factor setup for fsmonitor into function
465
+ - t/perf/fsmonitor: silence initial git commit
466
+ - t/perf/fsmonitor: shorten DESC to basename
467
+ - t/perf/fsmonitor: factor description out for readability
468
+ - t/perf/fsmonitor: improve error message if typoing hook name
469
+ - t/perf/fsmonitor: move watchman setup to one-time-repo-setup
470
+ - t/perf/fsmonitor: separate one time repo initialization
471
+ (this branch uses nk/diff-files-vs-fsmonitor.)
472
+
473
+
474
+* jk/checkout-index-errors (2020-10-27) 2 commits
475
+ - checkout-index: propagate errors to exit code
476
+ - checkout-index: drop error message from empty --stage=all
477
+
478
+
479
+* pw/rebase-i-orig-head (2020-10-27) 4 commits
480
+ - rebase -i: simplify get_revision_ranges()
481
+ - rebase -i: use struct object_id when writing state
482
+ - rebase -i: use struct object_id rather than looking up commit
483
+ - rebase -i: stop overwriting ORIG_HEAD buffer
484
+
485
+--------------------------------------------------
486
+[Stalled]
487
+
488
+* hn/reftable (2020-10-01) 13 commits
489
+ . reftable: "test-tool dump-reftable" command.
490
+ . reftable: rest of library
491
+ . reftable: file level tests
492
+ . reftable: read reftable files
493
+ . reftable: write reftable files
494
+ . reftable: a generic binary tree implementation
495
+ . reftable: reading/writing blocks
496
+ . reftable: (de)serialization for the polymorphic record type.
497
+ . reftable: utility functions
498
+ . reftable: add a barebones unittest framework
499
+ . vcxproj: adjust for the reftable changes
500
+ . reftable: define the public API
501
+ . reftable: add LICENSE
502
+
503
+ The reftable backend for the refs API.
504
+
505
+ Expecting a reroll.
506
+ Seems not to build for Windows folks.
507
+ cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
508
+ cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
509
+
510
+
511
+* sm/curl-retry (2020-10-13) 3 commits
512
+ - http: automatically retry some requests
513
+ - replace CURLOPT_FILE With CURLOPT_WRITEDATA
514
+ - remote-curl: add testing for intelligent retry for HTTP
515
+
516
+ The http transport has been taught to retry a failed request that
517
+ may reasonably be retried.
518
+
519
+ cf. <20201015000410.GB328643@google.com>
520
+
521
+
522
+* sv/t7001-modernize (2020-09-25) 11 commits
523
+ - t7001: move cleanup code from outside the tests into them
524
+ - t7001: use `test` rather than `[`
525
+ - t7001: use here-docs instead of echo
526
+ - t7001: put each command on a separate line
527
+ - t7001: use ': >' rather than 'touch'
528
+ - t7001: change (cd <path> && git foo) to (git -C <path> foo)
529
+ - t7001: remove whitespace after redirect operators
530
+ - t7001: change the style for cd according to subshell
531
+ - t7001: remove unnecessary blank lines
532
+ - t7001: use TAB instead of spaces
533
+ - t7001: convert tests from the old style to the current style
534
+
535
+ Test script modernization.
536
+
537
+ Expecting a reroll.
538
+ cf. <20200925170256.11490-1-shubhunic@gmail.com>
539
+
540
+
541
+* ew/decline-core-abbrev (2020-09-01) 1 commit
542
+ - core.abbrev <off|false|no> disables abbreviations
543
+
544
+ Allow the configuration to specify no abbreviation regardless of
545
+ the hash algorithm.
546
+
547
+ Expecting a reroll. The intent is very good.
548
+
549
+
550
+* bc/rev-parse-path-format (2020-10-09) 2 commits
551
+ - rev-parse: add option for absolute or relative path formatting
552
+ - abspath: add a function to resolve paths with missing components
553
+
554
+ "git rev-parse" can be explicitly told to give output as absolute
555
+ or relative path.
556
+
557
+
558
+* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
559
+ - config: option transfer.ipversion to set transport protocol version for network fetches
560
+
561
+ Adds transfer.ipversion configuration variable.
562
+
563
+ Needs more work.
564
+
565
+
566
+* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
567
+ - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
568
+
569
+ Doc update.
570
+
571
+ Expecting a reroll.
572
+ cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
573
+ cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
574
+
575
+
576
+* jc/war-on-dashed-git (2020-08-27) 1 commit
577
+ - git: catch an attempt to run "git-foo"
578
+
579
+ The first step to remove on-disk binaries for built-in subcommands
580
+ by soliciting objections.
581
+
582
+ On hold for now.
583
+
584
+
585
+* dr/push-remoteref-fix (2020-04-23) 1 commit
586
+ - remote.c: fix handling of %(push:remoteref)
587
+
588
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
589
+ "git format-patch" (and friends) only showed what got explicitly
590
+ configured, not what ref at the receiving end would be updated when
591
+ "git push" was used, as it ignored the default behaviour (e.g. update
592
+ the same ref as the source).
593
+
594
+ Discard for now.
595
+ cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
596
+ cf. <20200911214358.acl3hy2e763begoo@feanor>
597
+
598
+
599
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
600
+ - zlib.c: use size_t for size
601
+
602
+ The wrapper to call into zlib followed our long tradition to use
603
+ "unsigned long" for sizes of regions in memory, which have been
604
+ updated to use "size_t".
605
+
606
+--------------------------------------------------
607
+[Cooking]
608
+
609
+* en/strmap (2020-10-13) 10 commits
610
+ - strmap: enable allocations to come from a mem_pool
611
+ - strmap: add a strset sub-type
612
+ - strmap: add functions facilitating use as a string->int map
613
+ - strmap: enable faster clearing and reusing of strmaps
614
+ - strmap: add more utility functions
615
+ - strmap: new utility functions
616
+ - hashmap: introduce a new hashmap_partial_clear()
617
+ - hashmap: allow re-use after hashmap_free()
618
+ - hashmap: adjust spacing to fix argument alignment
619
+ - hashmap: add usage documentation explaining hashmap_free[_entries]()
620
+
621
+ A speciailization of hashmap that uses a string as key has been
622
+ introduced. Hopefully it will see wider use over time.
623
+
624
+ On hold.
625
+ cf. <20201023080202.GA4012156@coredump.intra.peff.net>
626
+ cf. <CABPp-BFV8ZAu5vLarG2mX8gT5bfV31oqbd-vjAQF_YDcyNSRiw@mail.gmail.com>
627
+
628
+
629
+* en/test-selector (2020-10-18) 3 commits
630
+ (merged to 'next' on 2020-10-26 at 3d6e77c3ff)
631
+ + test-lib: reduce verbosity of skipped tests
632
+ + t6006, t6012: adjust tests to use 'setup' instead of synonyms
633
+ + test-lib: allow selecting tests by substring/glob with --run
634
+
635
+ Our test scripts can be told to run only individual pieces while
636
+ skipping others with the "--run=..." option; they were taught to
637
+ take a substring of test title, in addition to numbers, to name the
638
+ test pices to run.
639
+
640
+ Will merge to 'master'.
641
+
642
+
643
+* jk/report-fn-typedef (2020-10-16) 1 commit
644
+ (merged to 'next' on 2020-10-26 at fa4e128b65)
645
+ + usage: define a type for a reporting function
646
+
647
Code clean-up.
648
130
- Will cook in 'next'.
649
+ Will merge to 'master'.
650
651
133
-* rs/worktree-list-show-locked (2020-10-12) 1 commit
134
- (merged to 'next' on 2020-10-15 at 3917e61c28)
135
- + worktree: teach `list` to annotate locked worktree
652
+* mr/bisect-in-c-3 (2020-10-16) 7 commits
653
+ - bisect--helper: retire `--bisect-autostart` subcommand
654
+ - bisect--helper: retire `--write-terms` subcommand
655
+ - bisect--helper: retire `--check-expected-revs` subcommand
656
+ - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
657
+ - bisect--helper: retire `--next-all` subcommand
658
+ - bisect--helper: retire `--bisect-clean-state` subcommand
659
+ - bisect--helper: finish porting `bisect_start()` to C
660
137
- "git worktree list" now shows if each worktree is locked. This
138
- possibly may open us to show other kinds of states in the future.
661
+ Rewriting "git bisect" in C continues.
662
140
- Will cook in 'next'.
663
+ Will merge to 'next'.
664
665
666
* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
144
- - t3435: add tests for rebase -r GPG signing
145
- - sequencer: pass explicit --no-gpg-sign to merge
146
- - sequencer: fix gpg option passed to merge subcommand
667
+ (merged to 'next' on 2020-10-26 at e1c956e52a)
668
+ + t3435: add tests for rebase -r GPG signing
669
+ + sequencer: pass explicit --no-gpg-sign to merge
670
+ + sequencer: fix gpg option passed to merge subcommand
671
672
"git rebase --rebase-merges" did not correctly pass --gpg-sign
673
command line option to underying "git merge" when replaying a merge
@@ -152,27 +676,17 @@ Release tarballs are available at:
676
done in a separate codepath, the problem did not trigger for most
677
users), which has been corrected.
678
155
- Will merge to 'next'.
156
-
157
-
158
-* sm/curl-retry (2020-10-13) 3 commits
159
- - http: automatically retry some requests
160
- - replace CURLOPT_FILE With CURLOPT_WRITEDATA
161
- - remote-curl: add testing for intelligent retry for HTTP
162
-
163
- The http transport has been taught to retry a failed request that
164
- may reasonably be retried.
165
-
166
- Need to pick up reroll.
679
+ Will merge to 'master'.
680
681
682
* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
170
- - hook: add sample template for push-to-checkout
683
+ (merged to 'next' on 2020-10-26 at 644026c2f6)
684
+ + hook: add sample template for push-to-checkout
685
686
Add a sample 'push-to-checkout' hook, that performs the same as
687
what the built-in default action does.
688
175
- Will merge to 'next'.
689
+ Will merge to 'master'.
690
691
692
* as/tests-cleanup (2020-10-18) 1 commit
@@ -183,27 +697,37 @@ Release tarballs are available at:
697
Will merge to 'next'.
698
699
186
-* bk/sob-dco (2020-10-18) 3 commits
187
- - SubmittingPatches: clarify DCO is our --signoff rule
188
- - Documentation: clarify and expand description of --signoff
189
- - doc: preparatory clean-up of description on the sign-off option
700
+* bk/sob-dco (2020-10-20) 4 commits
701
+ (merged to 'next' on 2020-10-26 at d0e5066a7e)
702
+ + Documentation: stylistically normalize references to Signed-off-by:
703
+ + SubmittingPatches: clarify DCO is our --signoff rule
704
+ + Documentation: clarify and expand description of --signoff
705
+ + doc: preparatory clean-up of description on the sign-off option
706
707
Document that the meaning of a Signed-off-by trailer can vary from
708
project to project in the end-user documentation, and clarify what
709
it means to this project.
710
711
+ Will merge to 'master'.
712
+
713
714
* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
197
- - t0000: use test_path_is_file instead of "test -f"
715
+ (merged to 'next' on 2020-10-26 at 9b70aa748f)
716
+ + t0000: use test_path_is_file instead of "test -f"
717
+
718
+ Originally merged to 'next' on 2020-10-23
719
720
Micro clean-up of a test script.
721
722
+ Will merge to 'master'.
723
+
724
725
* en/dir-rename-tests (2020-10-16) 4 commits
726
- t6423: more involved rules for renaming directories into each other
727
- t6423: update directory rename detection tests with new rule
728
- t6423: more involved directory rename test
729
- directory-rename-detection.txt: update references to regression tests
730
+ (this branch is used by en/merge-tests.)
731
732
More preliminary tests have been added to document desired outcome
733
of various "directory rename" situations.
@@ -212,15 +736,19 @@ Release tarballs are available at:
736
737
738
* en/t7518-unflake (2020-10-18) 1 commit
215
- - t7518: fix flaky grep invocation
739
+ (merged to 'next' on 2020-10-26 at 443459f7ca)
740
+ + t7518: fix flaky grep invocation
741
+
742
+ Originally merged to 'next' on 2020-10-23
743
744
Work around flakiness in a test.
745
219
- Will merge to 'next'.
746
+ Will merge to 'master'.
747
748
222
-* es/test-cmp-typocatcher (2020-10-16) 1 commit
223
- - Revert "test_cmp: diagnose incorrect arguments"
749
+* es/test-cmp-typocatcher (2020-10-20) 1 commit
750
+ (merged to 'next' on 2020-10-26 at 62d89db753)
751
+ + Revert "test_cmp: diagnose incorrect arguments"
752
753
A test helper "test_cmp A B" was taught to diagnose missing files A
754
or B as a bug in test, but some tests legitimately wanted to notice
@@ -228,7 +756,7 @@ Release tarballs are available at:
756
the expected result in it, and were misdiagnosed as a bug. This
757
has been corrected.
758
231
- Will merge to 'next'.
759
+ Will merge to 'master'.
760
761
762
* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
@@ -240,53 +768,64 @@ Release tarballs are available at:
768
769
770
* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
243
- - fast-import: fix over-allocation of marks storage
771
+ (merged to 'next' on 2020-10-26 at 2f0a73fd48)
772
+ + fast-import: fix over-allocation of marks storage
773
774
"git fast-import" wasted a lot of memory when many marks were in use.
775
247
- Will merge to 'next'.
776
+ Will merge to 'master'.
777
778
779
* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
251
- - fast-import: remove duplicated option-parsing line
780
+ (merged to 'next' on 2020-10-26 at 1ba987dd54)
781
+ + fast-import: remove duplicated option-parsing line
782
783
Code clean-up.
784
255
- Will merge to 'next'.
785
+ Will merge to 'master'.
786
787
788
* jk/no-common (2020-10-16) 1 commit
259
- - config.mak.dev: build with -fno-common
789
+ (merged to 'next' on 2020-10-26 at c888cb8b28)
790
+ + config.mak.dev: build with -fno-common
791
792
Dev support to catch a tentative definition of a variable in our C
793
code as an error.
794
264
- Will merge to 'next'.
795
+ Will merge to 'master'.
796
797
798
* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
268
- - ci: make the "skip-if-redundant" check more defensive
269
- - ci: work around old records of GitHub runs
799
+ (merged to 'next' on 2020-10-26 at 4832a8f40b)
800
+ + ci: make the "skip-if-redundant" check more defensive
801
+ + ci: work around old records of GitHub runs
802
+
803
+ Originally merged to 'next' on 2020-10-23
804
805
GitHub Actions automated test improvement to skip tests on a tree
806
identical to what has already been tested.
807
274
- Will merge to 'next'.
808
+ Will merge to 'master'.
809
810
811
* lo/zsh-completion (2020-10-16) 1 commit
278
- - completion: fix zsh installation instructions
812
+ (merged to 'next' on 2020-10-26 at 100dc6adde)
813
+ + completion: fix zsh installation instructions
814
815
Update instructions for command line completion (in contrib/) for zsh.
816
282
- Will merge to 'next'.
817
+ Will merge to 'master'.
818
819
285
-* nk/diff-files-vs-fsmonitor (2020-10-18) 4 commits
820
+* nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
821
+ - p7519-fsmonitor: add a git add benchmark
822
+ - p7519-fsmonitor: refactor to avoid code duplication
823
+ - perf lint: add make test-lint to perf tests
824
- t/perf: add fsmonitor perf test for git diff
825
- t/perf/p7519-fsmonitor.sh: warm cache on first git status
826
- t/perf/README: elaborate on output format
827
- fsmonitor: use fsmonitor data in `git diff`
828
+ (this branch is used by nk/perf-fsmonitor.)
829
830
"git diff" and other commands that share the same machinery to
831
compare with working tree files have been taught to take advantage
@@ -296,110 +835,23 @@ Release tarballs are available at:
835
836
837
* nk/dir-c-comment-update (2020-10-16) 1 commit
299
- - dir.c: fix comments to agree with argument name
838
+ (merged to 'next' on 2020-10-26 at 3a4cb82ad6)
839
+ + dir.c: fix comments to agree with argument name
840
841
Update stale in-code comment.
842
303
- Will merge to 'next'.
843
+ Will merge to 'master'.
844
845
846
* tk/credential-config (2020-10-16) 1 commit
307
- - credential: load default config
847
+ (merged to 'next' on 2020-10-26 at 6ab486f389)
848
+ + credential: load default config
849
850
"git credential' didn't honor the core.askPass configuration
851
variable (among other things), which has been corrected.
852
312
- Will merge to 'next'.
313
-
314
---------------------------------------------------
315
-[Stalled]
316
-
317
-* sv/t7001-modernize (2020-09-25) 11 commits
318
- - t7001: move cleanup code from outside the tests into them
319
- - t7001: use `test` rather than `[`
320
- - t7001: use here-docs instead of echo
321
- - t7001: put each command on a separate line
322
- - t7001: use ': >' rather than 'touch'
323
- - t7001: change (cd <path> && git foo) to (git -C <path> foo)
324
- - t7001: remove whitespace after redirect operators
325
- - t7001: change the style for cd according to subshell
326
- - t7001: remove unnecessary blank lines
327
- - t7001: use TAB instead of spaces
328
- - t7001: convert tests from the old style to the current style
329
-
330
- Test script modernization.
331
-
332
- Expecting a reroll.
333
- cf. <20200925170256.11490-1-shubhunic@gmail.com>
334
-
335
-
336
-* ew/decline-core-abbrev (2020-09-01) 1 commit
337
- - core.abbrev <off|false|no> disables abbreviations
338
-
339
- Allow the configuration to specify no abbreviation regardless of
340
- the hash algorithm.
341
-
342
- Expecting a reroll. The intent is very good.
343
-
344
-
345
-* bc/rev-parse-path-format (2020-10-09) 2 commits
346
- - rev-parse: add option for absolute or relative path formatting
347
- - abspath: add a function to resolve paths with missing components
348
-
349
- "git rev-parse" can be explicitly told to give output as absolute
350
- or relative path.
351
-
352
-
353
-* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
354
- - config: option transfer.ipversion to set transport protocol version for network fetches
355
-
356
- Adds transfer.ipversion configuration variable.
357
-
358
- Needs more work.
359
-
360
-
361
-* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
362
- - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
363
-
364
- Doc update.
365
-
366
- Expecting a reroll.
367
- cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
368
- cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
369
-
370
-
371
-* jc/war-on-dashed-git (2020-08-27) 1 commit
372
- - git: catch an attempt to run "git-foo"
373
-
374
- The first step to remove on-disk binaries for built-in subcommands
375
- by soliciting objections.
376
-
377
- On hold for now.
378
-
379
-
380
-* dr/push-remoteref-fix (2020-04-23) 1 commit
381
- - remote.c: fix handling of %(push:remoteref)
382
-
383
- The "%(push:remoteref)" placeholder in the "--format=" argument of
384
- "git format-patch" (and friends) only showed what got explicitly
385
- configured, not what ref at the receiving end would be updated when
386
- "git push" was used, as it ignored the default behaviour (e.g. update
387
- the same ref as the source).
388
-
389
- Discard for now.
390
- cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
391
- cf. <20200911214358.acl3hy2e763begoo@feanor>
392
-
393
-
394
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
395
- - zlib.c: use size_t for size
396
-
397
- The wrapper to call into zlib followed our long tradition to use
398
- "unsigned long" for sizes of regions in memory, which have been
399
- updated to use "size_t".
853
+ Will merge to 'master'.
854
401
---------------------------------------------------
402
-[Cooking]
855
856
* ag/merge-strategies-in-c (2020-10-06) 11 commits
857
- sequencer: use the "octopus" merge strategy without forking
@@ -418,8 +870,9 @@ Release tarballs are available at:
870
in C.
871
872
421
-* jk/symlinked-dotgitx-files (2020-10-06) 8 commits
422
- (merged to 'next' on 2020-10-08 at b9e128a280)
873
+* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
874
+ (merged to 'next' on 2020-10-26 at c1dd37b024)
875
+ + docs: document symlink restrictions for .git* files
876
+ fsck: complain when .gitattributes or .gitignore is a symlink
877
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
878
+ t0060: test obscured .gitattributes and .gitignore matching
@@ -429,103 +882,49 @@ Release tarballs are available at:
882
+ fsck_tree(): wrap some long lines
883
+ fsck_tree(): fix shadowed variable
884
885
+ Originally merged to 'next' on 2020-10-23
886
+
887
"git fsck" and the corresponding check done during the transport
888
learned to ensure that in-tree files like `.gitignore` and
889
`.gitattributes` are not symbolic links.
890
436
- Will cook in 'next'.
437
-
438
-
439
-* dl/checkout-guess (2020-10-08) 2 commits
440
- (merged to 'next' on 2020-10-08 at c9a6bc9a54)
441
- + checkout: learn to respect checkout.guess
442
- + Documentation/config/checkout: replace sq with backticks
443
-
444
- "git checkout" learned to use checkout.guess configuration variable
445
- and enable/disable its "--[no-]guess" option accordingly.
446
-
447
- Will cook in 'next'.
448
-
449
-
450
-* dl/checkout-p-merge-base (2020-10-07) 4 commits
451
- (merged to 'next' on 2020-10-08 at 807e047d68)
452
- + t2016: add a NEEDSWORK about the PERL prerequisite
453
- + add-patch: add NEEDSWORK about comparing commits
454
- + Doc: document "A...B" form for <tree-ish> in checkout and switch
455
- + builtin/checkout: fix `git checkout -p HEAD...` bug
456
-
457
- "git checkout -p A...B [-- <path>]" did not work, even though the
458
- same command without "-p" correctly used the merge-base between
459
- commits A and B.
460
-
461
- Will cook in 'next'.
891
+ Will merge to 'master'.
892
893
894
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
465
- - contrib/git-resurrect.sh: use hash-agnostic OID pattern
466
- - contrib/git-resurrect.sh: indent with tabs
895
+ (merged to 'next' on 2020-10-26 at 7e94297aa4)
896
+ + contrib/git-resurrect.sh: use hash-agnostic OID pattern
897
+ + contrib/git-resurrect.sh: indent with tabs
898
+
899
+ Originally merged to 'next' on 2020-10-23
900
901
"git resurrect" script (in contrib/) learned that the object names
902
may be longer than 40-hex depending on the hash function in use.
903
904
+ Will merge to 'master'.
905
+
906
907
* ds/commit-graph-merging-fix (2020-10-09) 2 commits
473
- - commit-graph: don't write commit-graph when disabled
474
- - commit-graph: ignore duplicates when merging layers
908
+ (merged to 'next' on 2020-10-26 at a0cf763826)
909
+ + commit-graph: don't write commit-graph when disabled
910
+ + commit-graph: ignore duplicates when merging layers
911
912
When "git commit-graph" detects the same commit recorded more than
913
once while it is merging the layers, it used to die. The code now
914
ignores all but one of them and continues.
915
480
- Will merge to 'next'.
916
+ Will merge to 'master'.
917
918
919
* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
484
- - maintenance: core.commitGraph=false prevents writes
485
- - maintenance: test commit-graph auto condition
920
+ (merged to 'next' on 2020-10-26 at 429d1371d8)
921
+ + maintenance: core.commitGraph=false prevents writes
922
+ + maintenance: test commit-graph auto condition
923
924
Test-coverage enhancement of running commit-graph task "git
925
maintenance" as needed led to discovery and fix of a bug.
926
490
- Will merge to 'next'.
491
-
492
-
493
-* js/userdiff-php (2020-10-07) 1 commit
494
- (merged to 'next' on 2020-10-08 at 988c7ea068)
495
- + userdiff: PHP: catch "abstract" and "final" functions
496
-
497
- Userdiff for PHP update.
498
-
499
- Will cook in 'next'.
500
-
501
-
502
-* kb/userdiff-rust-macro-rules (2020-10-07) 1 commit
503
- (merged to 'next' on 2020-10-08 at 949063bcae)
504
- + userdiff: recognize 'macro_rules!' as starting a Rust function block
505
-
506
- Userdiff for Rust update.
507
-
508
- Will cook in 'next'.
509
-
510
-
511
-* rk/completion-stash (2020-10-07) 2 commits
512
- (merged to 'next' on 2020-10-08 at ad60933f40)
513
- + git-completion.bash: stash-show: complete $__git_diff_common_options
514
- + git-completion.bash: __git_diff_common_options: add --[no-]patch
515
-
516
- The command line completion script (in contrib/) learned that "git
517
- stash show" takes the options "git diff" takes.
518
-
519
- Will cook in 'next'.
520
-
521
-
522
-* sd/userdiff-css-update (2020-10-08) 1 commit
523
- (merged to 'next' on 2020-10-08 at 69b7e9df5d)
524
- + userdiff: expand detected chunk headers for css
525
-
526
- Userdiff for CSS update.
527
-
528
- Will cook in 'next'.
927
+ Will merge to 'master'.
928
929
930
* ss/submodule-add-in-c (2020-10-07) 3 commits
@@ -551,118 +950,66 @@ Release tarballs are available at:
950
The commit-graph learned to use corrected commit dates instead of
951
the generation number to help topological revision traversal.
952
554
- How ready is this?
953
+ Almost there.
954
+ cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
955
956
557
-* mk/diff-ignore-regex (2020-10-16) 2 commits
558
- - diff: add -I<regex> that ignores matching changes
559
- - merge-base, xdiff: zero out xpparam_t structures
957
+* mk/diff-ignore-regex (2020-10-20) 2 commits
958
+ (merged to 'next' on 2020-10-26 at c68727da93)
959
+ + diff: add -I<regex> that ignores matching changes
960
+ + merge-base, xdiff: zero out xpparam_t structures
961
962
"git diff" family of commands learned the "-I<regex>" option to
963
ignore hunks whose changed lines all match the given pattern.
964
564
- Expecting a reroll.
565
-
566
-
567
-* mt/parallel-checkout-part-1 (2020-10-05) 20 commits
568
- (merged to 'next' on 2020-10-05 at 571e16d68a)
569
- + parallel-checkout: drop unused checkout state parameter
570
- (merged to 'next' on 2020-10-04 at 20438c1143)
571
- + ci: run test round with parallel-checkout enabled
572
- + parallel-checkout: add tests related to .gitattributes
573
- + parallel-checkout: add tests related to clone collisions
574
- + parallel-checkout: add tests for basic operations
575
- + checkout-index: add parallel checkout support
576
- + builtin/checkout.c: complete parallel checkout support
577
- + make_transient_cache_entry(): optionally alloc from mem_pool
578
- + parallel-checkout: support progress displaying
579
- + parallel-checkout: make it truly parallel
580
- + unpack-trees: add basic support for parallel checkout
581
- + entry: add checkout_entry_ca() which takes preloaded conv_attrs
582
- + entry: move conv_attrs lookup up to checkout_entry()
583
- + entry: extract cache_entry update from write_entry()
584
- + entry: make fstat_output() and read_blob_entry() public
585
- + entry: extract a header file for entry.c functions
586
- + convert: add conv_attrs classification
587
- + convert: add get_stream_filter_ca() variant
588
- + convert: add [async_]convert_to_working_tree_ca() variants
589
- + convert: make convert_attrs() and convert structs public
965
+ Will merge to 'master'.
966
+
967
+
968
+* mt/parallel-checkout-part-1 (2020-10-22) 20 commits
969
+ - parallel-checkout: drop unused checkout state parameter
970
+ - ci: run test round with parallel-checkout enabled
971
+ - parallel-checkout: add tests related to .gitattributes
972
+ - parallel-checkout: add tests related to clone collisions
973
+ - parallel-checkout: add tests for basic operations
974
+ - checkout-index: add parallel checkout support
975
+ - builtin/checkout.c: complete parallel checkout support
976
+ - make_transient_cache_entry(): optionally alloc from mem_pool
977
+ - parallel-checkout: support progress displaying
978
+ - parallel-checkout: make it truly parallel
979
+ - unpack-trees: add basic support for parallel checkout
980
+ - entry: add checkout_entry_ca() which takes preloaded conv_attrs
981
+ - entry: move conv_attrs lookup up to checkout_entry()
982
+ - entry: extract cache_entry update from write_entry()
983
+ - entry: make fstat_output() and read_blob_entry() public
984
+ - entry: extract a header file for entry.c functions
985
+ - convert: add conv_attrs classification
986
+ - convert: add get_stream_filter_ca() variant
987
+ - convert: add [async_]convert_to_working_tree_ca() variants
988
+ - convert: make convert_attrs() and convert structs public
989
990
Parallel checkout.
991
593
- Will cook in 'next'.
992
+ Ejected from 'next'
993
+ cf. <CAHd-oW568aNLYYMBDPJiUsWzh2xxtm8gnqLEiX_RTDa81BL_yw@mail.gmail.com>
994
995
996
* dl/diff-merge-base (2020-09-21) 10 commits
597
- - contrib/completion: complete `git diff --merge-base`
598
- - builtin/diff-tree: learn --merge-base
599
- - builtin/diff-index: learn --merge-base
600
- - t4068: add --merge-base tests
601
- - diff-lib: define diff_get_merge_base()
602
- - diff-lib: accept option flags in run_diff_index()
603
- - contrib/completion: extract common diff/difftool options
604
- - git-diff.txt: backtick quote command text
605
- - git-diff-index.txt: make --cached description a proper sentence
606
- - t4068: remove unnecessary >tmp
997
+ (merged to 'next' on 2020-10-26 at 114d94030b)
998
+ + contrib/completion: complete `git diff --merge-base`
999
+ + builtin/diff-tree: learn --merge-base
1000
+ + builtin/diff-index: learn --merge-base
1001
+ + t4068: add --merge-base tests
1002
+ + diff-lib: define diff_get_merge_base()
1003
+ + diff-lib: accept option flags in run_diff_index()
1004
+ + contrib/completion: extract common diff/difftool options
1005
+ + git-diff.txt: backtick quote command text
1006
+ + git-diff-index.txt: make --cached description a proper sentence
1007
+ + t4068: remove unnecessary >tmp
1008
1009
"git diff A...B" learned "git diff --merge-base A B", which is a
1010
longer short-hand to say the same thing.
1011
611
-
612
-* sb/clone-origin (2020-09-30) 7 commits
613
- (merged to 'next' on 2020-10-06 at 7178c9af9c)
614
- + clone: allow configurable default for `-o`/`--origin`
615
- + clone: read new remote name from remote_name instead of option_origin
616
- + clone: validate --origin option before use
617
- + refs: consolidate remote name validation
618
- + remote: add tests for add and rename with invalid names
619
- + clone: use more conventional config/option layering
620
- + clone: add tests for --template and some disallowed option pairs
621
-
622
- "git clone" learned clone.defaultremotename configuration variable
623
- to customize what nickname to use to call the remote the repository
624
- was cloned from.
625
-
626
- Will cook in 'next'.
627
-
628
-
629
-* sk/force-if-includes (2020-10-03) 4 commits
630
- (merged to 'next' on 2020-10-04 at 09c4c1e088)
631
- + t, doc: update tests, reference for "--force-if-includes"
632
- + push: parse and set flag for "--force-if-includes"
633
- + push: add reflog check for "--force-if-includes"
634
- + Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
635
-
636
- "git push --force-with-lease[=<ref>]" can easily be misused to lose
637
- commits unless the user takes good care of their own "git fetch".
638
- A new option "--force-if-includes" attempts to ensure that what is
639
- being force-pushed was created after examining the commit at the
640
- tip of the remote ref that is about to be force-replaced.
641
-
642
- Will cook in 'next'.
643
-
644
-
645
-* hn/reftable (2020-10-01) 13 commits
646
- . reftable: "test-tool dump-reftable" command.
647
- . reftable: rest of library
648
- . reftable: file level tests
649
- . reftable: read reftable files
650
- . reftable: write reftable files
651
- . reftable: a generic binary tree implementation
652
- . reftable: reading/writing blocks
653
- . reftable: (de)serialization for the polymorphic record type.
654
- . reftable: utility functions
655
- . reftable: add a barebones unittest framework
656
- . vcxproj: adjust for the reftable changes
657
- . reftable: define the public API
658
- . reftable: add LICENSE
659
-
660
- The reftable backend for the refs API.
661
-
662
- Expecting a reroll.
663
- Seems not to build for Windows folks.
664
- cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
665
- cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
1012
+ Will merge to 'master'.
1013
1014
1015
* ds/maintenance-part-3 (2020-10-16) 8 commits
@@ -674,7 +1021,6 @@ Release tarballs are available at:
1021
- for-each-repo: run subcommands on configured repos
1022
- maintenance: add --schedule option and config
1023
- maintenance: optionally skip --auto process
677
- (this branch uses ds/maintenance-part-2.)
1024
1025
Parts of "git maintenance" to ease writing crontab entries (and
1026
other scheduling system configuration) for it.
@@ -706,21 +1052,3 @@ Release tarballs are available at:
1052
1053
"git grep" has been tweaked to be limited to the sparse checkout
1054
paths.
709
-
710
-
711
-* ds/maintenance-part-2 (2020-09-25) 8 commits
712
- (merged to 'next' on 2020-10-04 at c2a46f390c)
713
- + maintenance: add incremental-repack auto condition
714
- + maintenance: auto-size incremental-repack batch
715
- + maintenance: add incremental-repack task
716
- + midx: use start_delayed_progress()
717
- + midx: enable core.multiPackIndex by default
718
- + maintenance: create auto condition for loose-objects
719
- + maintenance: add loose-objects task
720
- + maintenance: add prefetch task
721
- (this branch is used by ds/maintenance-part-3.)
722
-
723
- "git maintenance", an extended big brother of "git gc", continues
724
- to evolve.
725
-
726
- Will cook in 'next'.