What's cooking (2020/10 #05)
Junio C Hamano committed
Oct 29, 2020 at 14:51 UTC
b139c769b6b25db19b46c6ab80be6263e6a3e5d8
1 file changed
+181
-303
whats-cooking.txt
+181
-303
@@ -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, #04; Tue, 27)
4
-X-master-at: f9b6481aedae587b1380736fb8f21785119aeb48
5
-X-next-at: 6691a3f2fe6b2727a10cb93899847c6d6cd6ab69
3
+Subject: What's cooking in git.git (Oct 2020, #05; Thu, 29)
4
+X-master-at: ad27df6a5cff694add500ab8c7f97234feb4a91f
5
+X-next-at: ac1ea6bc6f5e42993b67661c5b0e2e7396ac2607
6
7
-What's cooking in git.git (Oct 2020, #04; Tue, 27)
7
+What's cooking in git.git (Oct 2020, #05; Thu, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,9 +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
-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'.
15
+Git 2.29.2 has been tagged. About 30+ topics are in 'next' waiting
16
+their turns to graduate to 'master', while a handful more of topics
17
+in 'seen' are marked to graduate to '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
@@ -44,189 +44,154 @@ Release tarballs are available at:
44
https://www.kernel.org/pub/software/scm/git/
45
46
--------------------------------------------------
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
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
-
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
-
70
- Originally merged to 'next' on 2020-10-08
71
-
72
- "git checkout" learned to use checkout.guess configuration variable
73
- and enable/disable its "--[no-]guess" option accordingly.
74
-
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
-
83
- Originally merged to 'next' on 2020-10-08
84
-
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
-
47
+[New Topics]
48
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.)
49
+* jk/sideband-more-error-checking (2020-10-29) 1 commit
50
+ - sideband: diagnose more sideband anomalies
51
+ (this branch uses js/avoid-split-sideband-message.)
52
102
- Originally merged to 'next' on 2020-10-04
53
+ The code to detect premature EOF in the sideband demultiplexer has
54
+ been cleaned up.
55
104
- "git maintenance", an extended big brother of "git gc", continues
105
- to evolve.
56
+ Will merge to 'next'.
57
58
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.)
59
+* js/default-branch-name-adjust-t5411 (2020-10-28) 4 commits
60
+ - t5411: finish preparing for `main` being the default branch name
61
+ - t5411: adjust the remaining support files for init.defaultBranch=main
62
+ - t5411: start adjusting the support files for init.defaultBranch=main
63
+ - t5411: start using the default branch name "main"
64
+ (this branch uses js/default-branch-name-part-4-minus-1.)
65
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.
66
+ Prepare a test script to transition of the default branch name to
67
+ 'main'.
68
69
+ Other than a minor nit, overall it looked sensible.
70
+ cf. <xmqq5z6u9kkv.fsf@gitster.c.googlers.com>
71
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
72
+--------------------------------------------------
73
+[Stalled]
74
124
- Brown-paper-bag fix.
75
+* hn/reftable (2020-10-01) 13 commits
76
+ . reftable: "test-tool dump-reftable" command.
77
+ . reftable: rest of library
78
+ . reftable: file level tests
79
+ . reftable: read reftable files
80
+ . reftable: write reftable files
81
+ . reftable: a generic binary tree implementation
82
+ . reftable: reading/writing blocks
83
+ . reftable: (de)serialization for the polymorphic record type.
84
+ . reftable: utility functions
85
+ . reftable: add a barebones unittest framework
86
+ . vcxproj: adjust for the reftable changes
87
+ . reftable: define the public API
88
+ . reftable: add LICENSE
89
90
+ The reftable backend for the refs API.
91
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
92
+ Expecting a reroll.
93
+ Seems not to build for Windows folks.
94
+ cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
95
+ cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
96
131
- Originally merged to 'next' on 2020-10-08
97
133
- Userdiff for PHP update.
98
+* sm/curl-retry (2020-10-13) 3 commits
99
+ - http: automatically retry some requests
100
+ - replace CURLOPT_FILE With CURLOPT_WRITEDATA
101
+ - remote-curl: add testing for intelligent retry for HTTP
102
103
+ The http transport has been taught to retry a failed request that
104
+ may reasonably be retried.
105
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
106
+ cf. <20201015000410.GB328643@google.com>
107
140
- Originally merged to 'next' on 2020-10-08
108
142
- Userdiff for Rust update.
109
+* sv/t7001-modernize (2020-09-25) 11 commits
110
+ - t7001: move cleanup code from outside the tests into them
111
+ - t7001: use `test` rather than `[`
112
+ - t7001: use here-docs instead of echo
113
+ - t7001: put each command on a separate line
114
+ - t7001: use ': >' rather than 'touch'
115
+ - t7001: change (cd <path> && git foo) to (git -C <path> foo)
116
+ - t7001: remove whitespace after redirect operators
117
+ - t7001: change the style for cd according to subshell
118
+ - t7001: remove unnecessary blank lines
119
+ - t7001: use TAB instead of spaces
120
+ - t7001: convert tests from the old style to the current style
121
122
+ Test script modernization.
123
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
124
+ Expecting a reroll.
125
+ cf. <20200925170256.11490-1-shubhunic@gmail.com>
126
150
- Originally merged to 'next' on 2020-10-08
127
152
- The command line completion script (in contrib/) learned that "git
153
- stash show" takes the options "git diff" takes.
128
+* ew/decline-core-abbrev (2020-09-01) 1 commit
129
+ - core.abbrev <off|false|no> disables abbreviations
130
131
+ Allow the configuration to specify no abbreviation regardless of
132
+ the hash algorithm.
133
156
-* rs/dist-doc-with-git-archive (2020-10-12) 2 commits
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
134
+ Expecting a reroll. The intent is very good.
135
161
- Originally merged to 'next' on 2020-10-15
136
163
- Use "git archive" more to produce the release tarball.
137
+* bc/rev-parse-path-format (2020-10-09) 2 commits
138
+ - rev-parse: add option for absolute or relative path formatting
139
+ - abspath: add a function to resolve paths with missing components
140
141
+ "git rev-parse" can be explicitly told to give output as absolute
142
+ or relative path.
143
166
-* rs/tighten-callers-of-deref-tag (2020-10-12) 3 commits
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
144
172
- Originally merged to 'next' on 2020-10-15
145
+* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
146
+ - config: option transfer.ipversion to set transport protocol version for network fetches
147
174
- Code clean-up.
148
+ Adds transfer.ipversion configuration variable.
149
150
+ Needs more work.
151
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
152
181
- Originally merged to 'next' on 2020-10-15
153
+* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
154
+ - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
155
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.
156
+ Doc update.
157
158
+ Expecting a reroll.
159
+ cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
160
+ cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
161
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
162
197
- Originally merged to 'next' on 2020-10-06
163
+* jc/war-on-dashed-git (2020-08-27) 1 commit
164
+ - git: catch an attempt to run "git-foo"
165
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.
166
+ The first step to remove on-disk binaries for built-in subcommands
167
+ by soliciting objections.
168
169
+ On hold for now.
170
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
171
208
- Originally merged to 'next' on 2020-10-08
172
+* dr/push-remoteref-fix (2020-04-23) 1 commit
173
+ - remote.c: fix handling of %(push:remoteref)
174
210
- Userdiff for CSS update.
175
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
176
+ "git format-patch" (and friends) only showed what got explicitly
177
+ configured, not what ref at the receiving end would be updated when
178
+ "git push" was used, as it ignored the default behaviour (e.g. update
179
+ the same ref as the source).
180
181
+ Discard for now.
182
+ cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
183
+ cf. <20200911214358.acl3hy2e763begoo@feanor>
184
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
185
220
- Originally merged to 'next' on 2020-10-04
186
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
187
+ - zlib.c: use size_t for size
188
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.
189
+ The wrapper to call into zlib followed our long tradition to use
190
+ "unsigned long" for sizes of regions in memory, which have been
191
+ updated to use "size_t".
192
193
--------------------------------------------------
229
-[New Topics]
194
+[Cooking]
195
196
* cm/t7xxx-cleanup (2020-10-22) 6 commits
197
(merged to 'next' on 2020-10-26 at 8b58e54942)
@@ -250,6 +215,7 @@ Release tarballs are available at:
215
(merged to 'next' on 2020-10-26 at 1b550f3245)
216
+ sideband: report unhandled incomplete sideband messages as bugs
217
+ sideband: avoid reporting incomplete sideband messages
218
+ (this branch is used by jk/sideband-more-error-checking.)
219
220
The side-band status report can be sent at the same time as the
221
primary payload multiplexed, but the demultiplexer on the receiving
@@ -277,7 +243,7 @@ Release tarballs are available at:
243
244
Code clean-up.
245
280
- Unneeded?
246
+ Unneeded? Perhaps will drop.
247
cf. <20201022183822.GA781760@nand.local>
248
249
@@ -308,16 +274,17 @@ Release tarballs are available at:
274
the reader side a bit (which we may want to tighten again in a year
275
or so).
276
311
- Is this a real issue, or just a theoretical one?
277
+ Is this a real issue, or just a theoretical one? Perhaps drop?
278
cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
279
280
281
* jk/perl-warning (2020-10-21) 1 commit
316
- - perl: check for perl warnings while running tests
282
+ (merged to 'next' on 2020-10-28 at 5fcb98f2ff)
283
+ + perl: check for perl warnings while running tests
284
285
Dev support.
286
320
- Will merge to 'next'.
287
+ Will merge to 'master'.
288
cf. <20201022032400.GC1480820@coredump.intra.peff.net>
289
290
@@ -332,6 +299,7 @@ Release tarballs are available at:
299
+ tests: start moving to a different default main branch name
300
+ t9801: use `--` in preparation for default branch rename
301
+ fmt-merge-msg: also suppress "into main" by default
302
+ (this branch is used by js/default-branch-name-adjust-t5411.)
303
304
Adjust tests so that they won't scream when the default initial
305
branch name is changed to 'main'.
@@ -348,7 +316,7 @@ Release tarballs are available at:
316
Will merge to 'master'.
317
318
351
-* pb/ref-filter-with-crlf (2020-10-22) 2 commits
319
+* pb/ref-filter-with-crlf (2020-10-29) 2 commits
320
- log, show: add tests for messages containing CRLF
321
- ref-filter: handle CRLF at end-of-line more gracefully
322
@@ -378,15 +346,19 @@ Release tarballs are available at:
346
Exit codes from "git remote add" etc. were not usable by scripted
347
callers.
348
349
+ Will merge to 'next'.
350
+
351
382
-* en/merge-ort-api-null-impl (2020-10-26) 4 commits
352
+* en/merge-ort-api-null-impl (2020-10-29) 4 commits
353
- merge,rebase,revert: select ort or recursive by config or environment
384
- - fast-rebase: demonstrate merge-ort's API via temporary/hidden command
354
+ - fast-rebase: demonstrate merge-ort's API via new test-tool command
355
- merge-ort-wrappers: new convience wrappers to mimic the old merge API
356
- merge-ort: barebones API of new merge strategy with empty implementation
357
358
Preparation for a new merge strategy.
359
360
+ Looking good.
361
+
362
363
* en/merge-tests (2020-10-26) 9 commits
364
- t6423: add more details about direct resolution of directories
@@ -408,6 +380,8 @@ Release tarballs are available at:
380
381
Code symplification.
382
383
+ Will merge to 'next'.
384
+
385
386
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
387
- diff: do not show submodule with untracked files as "-dirty"
@@ -421,7 +395,7 @@ Release tarballs are available at:
395
Needs doc update.
396
397
424
-* fc/zsh-completion (2020-10-26) 29 commits
398
+* fc/zsh-completion (2020-10-28) 29 commits
399
- zsh: update copyright notices
400
- completion: bash: remove old compat wrappers
401
- completion: bash: cleanup cygwin check
@@ -452,10 +426,18 @@ Release tarballs are available at:
426
- completion: zsh: fix name due to broken autoloading
427
- completion: zsh: fix __gitcomp_direct()
428
429
+ Zsh autocompletion (in contrib/) update.
430
+
431
+ Will merge to 'next'.
432
+
433
434
* jc/doc-final-resend (2020-10-26) 1 commit
435
- SubmittingPatches: clarify the purpose of the final resend
436
437
+ Update developer doc.
438
+
439
+ Will merge to 'next'.
440
+
441
442
* nk/perf-fsmonitor (2020-10-26) 10 commits
443
- t/perf/fsmonitor: add benchmark for dirty status
@@ -470,10 +452,18 @@ Release tarballs are available at:
452
- t/perf/fsmonitor: separate one time repo initialization
453
(this branch uses nk/diff-files-vs-fsmonitor.)
454
455
+ Add t/perf support for fsmonitor.
456
+
457
458
* jk/checkout-index-errors (2020-10-27) 2 commits
459
- checkout-index: propagate errors to exit code
460
- checkout-index: drop error message from empty --stage=all
461
+ (this branch is used by mt/parallel-checkout-part-1.)
462
+
463
+ "git checkout-index" did not consistently signal an error with its
464
+ exit status.
465
+
466
+ Will merge to 'next'.
467
468
469
* pw/rebase-i-orig-head (2020-10-27) 4 commits
@@ -482,130 +472,13 @@ Release tarballs are available at:
472
- rebase -i: use struct object_id rather than looking up commit
473
- rebase -i: stop overwriting ORIG_HEAD buffer
474
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
475
+ "git rebase -i" did not
476
554
- "git rev-parse" can be explicitly told to give output as absolute
555
- or relative path.
477
+ Expecting an update to the log message, but otherwise the change
478
+ looked sensible.
479
+ cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
480
481
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
-
482
* en/strmap (2020-10-13) 10 commits
483
- strmap: enable allocations to come from a mem_pool
484
- strmap: add a strset sub-type
@@ -650,17 +523,18 @@ Release tarballs are available at:
523
524
525
* 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
526
+ (merged to 'next' on 2020-10-28 at 435792b62f)
527
+ + bisect--helper: retire `--bisect-autostart` subcommand
528
+ + bisect--helper: retire `--write-terms` subcommand
529
+ + bisect--helper: retire `--check-expected-revs` subcommand
530
+ + bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
531
+ + bisect--helper: retire `--next-all` subcommand
532
+ + bisect--helper: retire `--bisect-clean-state` subcommand
533
+ + bisect--helper: finish porting `bisect_start()` to C
534
535
Rewriting "git bisect" in C continues.
536
663
- Will merge to 'next'.
537
+ Will merge to 'master'.
538
539
540
* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
@@ -690,11 +564,12 @@ Release tarballs are available at:
564
565
566
* as/tests-cleanup (2020-10-18) 1 commit
693
- - t2200,t9832: avoid using 'git' upstream in a pipe
567
+ (merged to 'next' on 2020-10-28 at fd199beb31)
568
+ + t2200,t9832: avoid using 'git' upstream in a pipe
569
570
Micro clean-up of a couple of test scripts.
571
697
- Will merge to 'next'.
572
+ Will merge to 'master'.
573
574
575
* bk/sob-dco (2020-10-20) 4 commits
@@ -723,16 +598,17 @@ Release tarballs are available at:
598
599
600
* 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
601
+ (merged to 'next' on 2020-10-28 at 7bbe123e70)
602
+ + t6423: more involved rules for renaming directories into each other
603
+ + t6423: update directory rename detection tests with new rule
604
+ + t6423: more involved directory rename test
605
+ + directory-rename-detection.txt: update references to regression tests
606
(this branch is used by en/merge-tests.)
607
608
More preliminary tests have been added to document desired outcome
609
of various "directory rename" situations.
610
735
- Will merge to 'next'.
611
+ Will merge to 'master'.
612
613
614
* en/t7518-unflake (2020-10-18) 1 commit
@@ -760,11 +636,12 @@ Release tarballs are available at:
636
637
638
* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
763
- - MyFirstContribution: clarify asciidoc dependency
639
+ (merged to 'next' on 2020-10-28 at 96e0d84d94)
640
+ + MyFirstContribution: clarify asciidoc dependency
641
642
Doc update.
643
767
- Will merge to 'next'.
644
+ Will merge to 'master'.
645
646
647
* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
@@ -818,20 +695,21 @@ Release tarballs are available at:
695
696
697
* 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`
698
+ (merged to 'next' on 2020-10-28 at d3af804056)
699
+ + p7519-fsmonitor: add a git add benchmark
700
+ + p7519-fsmonitor: refactor to avoid code duplication
701
+ + perf lint: add make test-lint to perf tests
702
+ + t/perf: add fsmonitor perf test for git diff
703
+ + t/perf/p7519-fsmonitor.sh: warm cache on first git status
704
+ + t/perf/README: elaborate on output format
705
+ + fsmonitor: use fsmonitor data in `git diff`
706
(this branch is used by nk/perf-fsmonitor.)
707
708
"git diff" and other commands that share the same machinery to
709
compare with working tree files have been taught to take advantage
710
of the fsmonitor data when available.
711
834
- Will merge to 'next'.
712
+ Will merge to 'master'.
713
714
715
* nk/dir-c-comment-update (2020-10-16) 1 commit
@@ -888,7 +766,10 @@ Release tarballs are available at:
766
learned to ensure that in-tree files like `.gitignore` and
767
`.gitattributes` are not symbolic links.
768
891
- Will merge to 'master'.
769
+ It seems that there are real projects with .gitignore recorded as
770
+ symlinks, which may need to loosen the fsck setting. Do we need
771
+ to introduce a class that is separate from symlinked .gitmodules
772
+ that probably is with potential consequences that is more grave?
773
774
775
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
@@ -965,8 +846,7 @@ Release tarballs are available at:
846
Will merge to 'master'.
847
848
968
-* mt/parallel-checkout-part-1 (2020-10-22) 20 commits
969
- - parallel-checkout: drop unused checkout state parameter
849
+* mt/parallel-checkout-part-1 (2020-10-29) 19 commits
850
- ci: run test round with parallel-checkout enabled
851
- parallel-checkout: add tests related to .gitattributes
852
- parallel-checkout: add tests related to clone collisions
@@ -986,12 +866,10 @@ Release tarballs are available at:
866
- convert: add get_stream_filter_ca() variant
867
- convert: add [async_]convert_to_working_tree_ca() variants
868
- convert: make convert_attrs() and convert structs public
869
+ (this branch uses jk/checkout-index-errors.)
870
871
Parallel checkout.
872
992
- Ejected from 'next'
993
- cf. <CAHd-oW568aNLYYMBDPJiUsWzh2xxtm8gnqLEiX_RTDa81BL_yw@mail.gmail.com>
994
-
873
874
* dl/diff-merge-base (2020-09-21) 10 commits
875
(merged to 'next' on 2020-10-26 at 114d94030b)