What's cooking (2022/08 #01)
Junio C Hamano committed
Aug 1, 2022 at 10:58 UTC
a5d8d7256abf415c0558b436a2a04b913c04ae63
1 file changed
+108
-228
whats-cooking.txt
+108
-228
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2022, #08; Fri, 29)
3
-X-master-at: 23b219f8e3f2adfb0441e135f0a880e6124f766c
4
-X-next-at: 78731f0fdbef5bf997eda274d67cbd79ffaaf815
2
+Subject: What's cooking in git.git (Aug 2022, #01; Mon, 1)
3
+X-master-at: 350dc9f0e8974b6fcbdeb3808186c5a79c3e7386
4
+X-next-at: 60a89aff129e69125857350fd1eaa291c90d2ab1
5
6
-What's cooking in git.git (Jul 2022, #08; Fri, 29)
6
+What's cooking in git.git (Aug 2022, #01; Mon, 1)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -12,6 +12,10 @@ topic is stable enough to be used and are candidate to be in a
12
future release). Commits prefixed with '-' are only in 'seen',
13
and aren't considered "accepted" at all.
14
15
+A handful of topics have graduated to the 'master' track, and half a
16
+dozen topics are now in 'next' to cook. We are starting Week #4 of
17
+a 12-week cycle.
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 or their mirrors. Some
21
repositories have only a subset of branches.
@@ -43,126 +47,96 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[Graduated to 'master']
49
46
-* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit
47
- (merged to 'next' on 2022-07-19 at f77cd40c29)
48
- + trace2: only include "fsync" events if we git_fsync()
49
-
50
- Omit fsync-related trace2 entries when their values are all zero.
51
- source: <patch-v3-1.1-979dea5956a-20220718T102747Z-avarab@gmail.com>
52
-
53
-
54
-* ds/doc-wo-whitelist (2022-07-19) 5 commits
55
- (merged to 'next' on 2022-07-20 at ec51c6269a)
56
- + transport.c: avoid "whitelist"
57
- + t: avoid "whitelist"
58
- + git.txt: remove redundant language
59
- + git-cvsserver: clarify directory list
60
- + daemon: clarify directory arguments
61
-
62
- Avoid "white/black-list" in documentation and code comments.
63
- source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com>
64
-
65
-
66
-* ds/win-syslog-compiler-fix (2022-07-19) 1 commit
67
- (merged to 'next' on 2022-07-20 at d38b649b18)
68
- + compat/win32: correct for incorrect compiler warning
69
-
70
- Workaround for a false positive compiler warning.
71
- source: <pull.1294.git.1658256354725.gitgitgadget@gmail.com>
72
-
73
-
74
-* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit
75
- (merged to 'next' on 2022-07-19 at bcc29d823d)
76
- + commit-graph: pass repo_settings instead of repository
77
-
78
- API tweak to make it easier to run fuzz testing on commit-graph parser.
79
- source: <fd70b6119153b165a62ee4f693dbe47031cfb2be.1657834657.git.steadmon@google.com>
80
-
81
-
82
-* ld/osx-keychain-usage-fix (2022-07-19) 1 commit
83
- (merged to 'next' on 2022-07-20 at eebd316ef6)
84
- + osx-keychain: fix compiler warning
85
-
86
- Workaround for a compiler warning against use of die() in
87
- osx-keychain (in contrib/).
88
- source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com>
89
-
90
-
91
-* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit
92
- (merged to 'next' on 2022-07-19 at c259b61b0e)
93
- + config/core.txt: fix minor issues for `core.sparseCheckoutCone`
94
-
95
- Docfix.
96
- source: <20220718100530.2068354-1-martin.agren@gmail.com>
50
+* cl/rerere-train-with-no-sign (2022-07-19) 1 commit
51
+ (merged to 'next' on 2022-07-20 at fbb9414d09)
52
+ + contrib/rerere-train: avoid useless gpg sign in training
53
54
+ "rerere-train" script (in contrib/) used to honor commit.gpgSign
55
+ while recreating the throw-away merges.
56
+ source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
57
99
-* ma/t4200-update (2022-07-18) 1 commit
100
- (merged to 'next' on 2022-07-19 at 710d0cafd9)
101
- + t4200: drop irrelevant code
58
103
- Test fix.
104
- source: <20220718154322.2177166-1-martin.agren@gmail.com>
59
+* ds/rebase-update-ref (2022-07-19) 13 commits
60
+ (merged to 'next' on 2022-07-20 at 9f4bf9ef6c)
61
+ + sequencer: notify user of --update-refs activity
62
+ + sequencer: ignore HEAD ref under --update-refs
63
+ + rebase: add rebase.updateRefs config option
64
+ + sequencer: rewrite update-refs as user edits todo list
65
+ + rebase: update refs from 'update-ref' commands
66
+ + rebase: add --update-refs option
67
+ + sequencer: add update-ref command
68
+ + sequencer: define array with enum values
69
+ + rebase-interactive: update 'merge' description
70
+ + branch: consider refs under 'update-refs'
71
+ + t2407: test branches currently using apply backend
72
+ + t2407: test bisect and rebase as black-boxes
73
+ + Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref
74
75
+ "git rebase -i" learns to update branches whose tip appear in the
76
+ rebased range with "--update-refs" option.
77
+ source: <pull.1247.v5.git.1658255624.gitgitgadget@gmail.com>
78
107
-* mb/config-document-include (2022-07-17) 1 commit
108
- (merged to 'next' on 2022-07-19 at 8267b80aa2)
109
- + config.txt: document include, includeIf
79
111
- Add missing documentation for "include" and "includeIf" features in
112
- "git config" file format, which incidentally teaches the command
113
- line completion to include them in its offerings.
114
- source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com>
80
+* kk/p4-client-name-encoding-fix (2022-07-21) 2 commits
81
+ (merged to 'next' on 2022-07-21 at 008518b4e5)
82
+ + git-p4: refactoring of p4CmdList()
83
+ (merged to 'next' on 2022-07-11 at 9c18616f76)
84
+ + git-p4: fix bug with encoding of p4 client name
85
86
+ "git p4" did not handle non-ASCII client name well, which has been
87
+ corrected.
88
+ source: <pull.1285.v3.git.git.1658394440.gitgitgadget@gmail.com>
89
117
-* mb/p4-fixes (2022-07-20) 2 commits
118
- (merged to 'next' on 2022-07-20 at 7942d72b1c)
119
- + git-p4: fix error handling in P4Unshelve.renameBranch()
120
- + git-p4: fix typo in P4Submit.applyCommit()
90
122
- Fix a few issues in "git p4".
123
- source: <pull.1297.v2.git.git.1658343330.gitgitgadget@gmail.com>
91
+* mt/checkout-count-fix (2022-07-14) 3 commits
92
+ (merged to 'next' on 2022-07-22 at 60c73a6b0b)
93
+ + checkout: fix two bugs on the final count of updated entries
94
+ + checkout: show bug about failed entries being included in final report
95
+ + checkout: document bug where delayed checkout counts entries twice
96
+ (this branch is used by mt/rot13-in-c.)
97
98
+ "git checkout" miscounted the paths it updated, which has been
99
+ corrected.
100
+ source: <cover.1657799213.git.matheus.bernardino@usp.br>
101
126
-* mb/p4-utf16-crlf (2022-07-20) 1 commit
127
- (merged to 'next' on 2022-07-20 at c2fedd2fc2)
128
- + git-p4: fix CR LF handling for utf16 files
102
130
- "git p4" working on UTF-16 files on Windows did not implement
131
- CRLF-to-LF conversion correctly, which has been corrected.
132
- source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com>
103
+* mt/pkt-line-comment-tweak (2022-07-22) 1 commit
104
+ (merged to 'next' on 2022-07-22 at 4004fa75eb)
105
+ + pkt-line.h: move comment closer to the associated code
106
107
+ In-code comment clarification.
108
+ source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br>
109
135
-* sg/index-format-doc-update (2022-07-18) 1 commit
136
- (merged to 'next' on 2022-07-19 at ccc384be5e)
137
- + index-format.txt: remove outdated list of supported extensions
110
+--------------------------------------------------
111
+[Stalled]
112
139
- Docfix.
140
- source: <20220718085640.7395-1-szeder.dev@gmail.com>
113
+* tk/apply-case-insensitive (2022-06-21) 3 commits
114
+ - apply: support case-only renames in case-insensitive filesystems
115
+ - reset: new failing test for reset of case-insensitive duplicate in index
116
+ - t4141: test "git apply" with core.ignorecase
117
118
+ "git apply" barfed on a patch that makes a case-only rename on a
119
+ case-insensitive filesystem.
120
143
-* tl/pack-bitmap-error-messages (2022-07-18) 6 commits
144
- (merged to 'next' on 2022-07-19 at 3f9565653a)
145
- + pack-bitmap.c: continue looping when first MIDX bitmap is found
146
- + pack-bitmap.c: using error() instead of silently returning -1
147
- + pack-bitmap.c: do not ignore error when opening a bitmap file
148
- + pack-bitmap.c: rename "idx_name" to "bitmap_name"
149
- + pack-bitmap.c: mark more strings for translations
150
- + pack-bitmap.c: fix formatting of error messages
121
+ Needs review.
122
+ source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
123
152
- Tweak various messages that come from the pack-bitmap codepaths.
153
- source: <cover.1658159745.git.dyroneteng@gmail.com>
124
125
+* bc/stash-export (2022-04-08) 4 commits
126
+ - builtin/stash: provide a way to import stashes from a ref
127
+ - builtin/stash: provide a way to export stashes to a ref
128
+ - builtin/stash: factor out revision parsing into a function
129
+ - object-name: make get_oid quietly return an error
130
156
-* vd/scalar-doc (2022-07-18) 2 commits
157
- (merged to 'next' on 2022-07-20 at fab0234da4)
158
- + scalar: convert README.md into a technical design doc
159
- + scalar: reword command documentation to clarify purpose
131
+ A mechanism to export and import stash entries to and from a normal
132
+ commit to transfer it across repositories has been introduced.
133
161
- Doc update.
162
- source: <pull.1275.v2.git.1657584367.gitgitgadget@gmail.com>
134
+ Expecting a reroll.
135
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
136
+ source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
137
138
--------------------------------------------------
165
-[New Topics]
139
+[Cooking]
140
141
* tb/cat-file-z (2022-07-22) 2 commits
142
(merged to 'next' on 2022-07-28 at 78731f0fdb)
@@ -230,12 +204,13 @@ Release tarballs are available at:
204
205
206
* ca/unignore-local-installation-on-windows (2022-07-27) 1 commit
233
- - cmake: support local installations of git
207
+ (merged to 'next' on 2022-08-01 at 1d4f4c32a6)
208
+ + cmake: support local installations of git
209
210
Fix build procedure for Windows that uses CMake so that it can pick
211
up the shell interpreter from local installation location.
212
238
- Will merge to 'next'.
213
+ Will merge to 'master'.
214
source: <pull.1304.git.1658912756815.gitgitgadget@gmail.com>
215
216
@@ -287,22 +262,24 @@ Release tarballs are available at:
262
263
264
* js/lstat-mingw-enotdir-fix (2022-07-29) 1 commit
290
- - lstat(mingw): correctly detect ENOTDIR scenarios
265
+ (merged to 'next' on 2022-08-01 at 10499943b7)
266
+ + lstat(mingw): correctly detect ENOTDIR scenarios
267
268
Fix to lstat() emulation on Windows.
269
294
- Will merge to 'next'.
270
+ Will merge to 'master'.
271
source: <pull.1291.v3.git.1659089152877.gitgitgadget@gmail.com>
272
273
274
* js/mingw-with-python (2022-07-29) 3 commits
299
- - mingw: remove unneeded `NO_CURL` directive
300
- - mingw: remove unneeded `NO_GETTEXT` directive
301
- - windows: include the Python bits when building Git for Windows
275
+ (merged to 'next' on 2022-08-01 at 73b8f06182)
276
+ + mingw: remove unneeded `NO_CURL` directive
277
+ + mingw: remove unneeded `NO_GETTEXT` directive
278
+ + windows: include the Python bits when building Git for Windows
279
280
Conditionally allow building Python interpreter on Windows
281
305
- Will merge to 'next'.
282
+ Will merge to 'master'.
283
source: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>
284
285
@@ -350,69 +327,42 @@ Release tarballs are available at:
327
source: <cover-v2-0.9-00000000000-20220729T081959Z-avarab@gmail.com>
328
329
353
-* jk/struct-zero-init-with-older-gcc (2022-07-29) 1 commit
354
- - config.mak.dev: squelch -Wno-missing-braces for older gcc
330
+* jk/struct-zero-init-with-older-gcc (2022-07-31) 1 commit
331
+ (merged to 'next' on 2022-08-01 at cde4f95964)
332
+ + config.mak.dev: squelch -Wno-missing-braces for older gcc
333
334
Older gcc with -Wall complains about the universal zero initializer
335
"struct s = { 0 };" idiom, which makes developers' lives
336
inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The
359
- build procedure has been tweaked to help them with thes compilers.
337
+ build procedure has been tweaked to help these compilers.
338
361
- Will merge to 'next'.
339
+ Will merge to 'master'.
340
source: <YuQ60ZUPBHAVETD7@coredump.intra.peff.net>
341
342
365
-* js/ort-clean-up-after-failed-merge (2022-07-29) 2 commits
366
- - merge-ort: do leave trace2 region even if checkout fails
367
- - merge-ort: clean up after failed merge
343
+* js/ort-clean-up-after-failed-merge (2022-07-31) 2 commits
344
+ (merged to 'next' on 2022-08-01 at 0c9f02f3ec)
345
+ + merge-ort: do leave trace2 region even if checkout fails
346
+ + merge-ort: clean up after failed merge
347
348
Plug memory leaks in the failure code path in the "merge-ort" merge
349
strategy backend.
350
372
- Will merge to 'next'?
351
+ Will merge to 'master'.
352
source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
353
354
355
* js/t5351-freebsd-fix (2022-07-29) 2 commits
377
- - t5351: avoid using `test_cmp` for binary data
378
- - t5351: avoid relying on `core.fsyncMethod = batch` to be supported
356
+ (merged to 'next' on 2022-08-01 at b47609e891)
357
+ + t5351: avoid using `test_cmp` for binary data
358
+ + t5351: avoid relying on `core.fsyncMethod = batch` to be supported
359
360
Some tests assumed that core.fsyncMethod=batch is supported
361
everywhere, which broke FreeBSD.
362
383
- Will merge to 'next'.
363
+ Will merge to 'master'.
364
source: <pull.1308.git.1659097724.gitgitgadget@gmail.com>
365
386
---------------------------------------------------
387
-[Stalled]
388
-
389
-* tk/apply-case-insensitive (2022-06-21) 3 commits
390
- - apply: support case-only renames in case-insensitive filesystems
391
- - reset: new failing test for reset of case-insensitive duplicate in index
392
- - t4141: test "git apply" with core.ignorecase
393
-
394
- "git apply" barfed on a patch that makes a case-only rename on a
395
- case-insensitive filesystem.
396
-
397
- Needs review.
398
- source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
399
-
400
-
401
-* bc/stash-export (2022-04-08) 4 commits
402
- - builtin/stash: provide a way to import stashes from a ref
403
- - builtin/stash: provide a way to export stashes to a ref
404
- - builtin/stash: factor out revision parsing into a function
405
- - object-name: make get_oid quietly return an error
406
-
407
- A mechanism to export and import stash entries to and from a normal
408
- commit to transfer it across repositories has been introduced.
409
-
410
- Expecting a reroll.
411
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
412
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
413
-
414
---------------------------------------------------
415
-[Cooking]
366
367
* cw/remote-object-info (2022-07-28) 6 commits
368
- cat-file: add remote-object-info to batch-command
@@ -443,7 +393,9 @@ Release tarballs are available at:
393
- test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
394
- test-lib: use $1, not $@ in test_known_broken_{ok,failure}_
395
446
- Plugging more leaks.
396
+ Extend SANITIZE=leak checking and declare more tests "currently leak-free".
397
+
398
+ Will merge to 'next'?
399
source: <cover-v3-00.15-00000000000-20220727T230800Z-avarab@gmail.com>
400
401
@@ -457,25 +409,14 @@ Release tarballs are available at:
409
source: <xmqq7d471dns.fsf@gitster.g>
410
411
460
-* mt/pkt-line-comment-tweak (2022-07-22) 1 commit
461
- (merged to 'next' on 2022-07-22 at 4004fa75eb)
462
- + pkt-line.h: move comment closer to the associated code
463
-
464
- In-code comment clarification.
465
-
466
- Will merge to 'master'.
467
- source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br>
468
-
469
-
470
-* mt/rot13-in-c (2022-07-24) 2 commits
471
- - t/t0021: convert the rot13-filter.pl script to C
412
+* mt/rot13-in-c (2022-07-31) 4 commits
413
+ - tests: use the new C rot13-filter helper to avoid PERL prereq
414
+ - t0021: implementation the rot13-filter.pl script in C
415
+ - t0021: avoid grepping for a Perl-specific string at filter output
416
- Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
473
- (this branch uses mt/checkout-count-fix.)
417
418
Test portability improvements.
476
-
477
- Needs review.
478
- source: <f38f722de7c3323207eda5ea632b5acd3765c285.1658675222.git.matheus.bernardino@usp.br>
419
+ source: <cover.1659291025.git.matheus.bernardino@usp.br>
420
421
422
* tk/untracked-cache-with-uall (2022-07-22) 1 commit
@@ -516,17 +457,6 @@ Release tarballs are available at:
457
source: <cover.1658472474.git.dyroneteng@gmail.com>
458
459
519
-* cl/rerere-train-with-no-sign (2022-07-19) 1 commit
520
- (merged to 'next' on 2022-07-20 at fbb9414d09)
521
- + contrib/rerere-train: avoid useless gpg sign in training
522
-
523
- "rerere-train" script (in contrib/) used to honor commit.gpgSign
524
- while recreating the throw-away merges.
525
-
526
- Will merge to 'master'.
527
- source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
528
-
529
-
460
* ab/submodule-helper-leakfix (2022-07-28) 18 commits
461
- submodule--helper: fix a configure_added_submodule() leak
462
- submodule--helper: free rest of "displaypath" in "struct update_data"
@@ -603,20 +533,6 @@ Release tarballs are available at:
533
source: <20220728211221.2913928-1-calvinwan@google.com>
534
535
606
-* mt/checkout-count-fix (2022-07-14) 3 commits
607
- (merged to 'next' on 2022-07-22 at 60c73a6b0b)
608
- + checkout: fix two bugs on the final count of updated entries
609
- + checkout: show bug about failed entries being included in final report
610
- + checkout: document bug where delayed checkout counts entries twice
611
- (this branch is used by mt/rot13-in-c.)
612
-
613
- "git checkout" miscounted the paths it updated, which has been
614
- corrected.
615
-
616
- Will merge to 'master'.
617
- source: <cover.1657799213.git.matheus.bernardino@usp.br>
618
-
619
-
536
* tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits
537
(merged to 'next' on 2022-07-25 at e3464c2c1d)
538
+ commit-graph: fix corrupt upgrade from generation v1 to v2
@@ -679,19 +595,6 @@ Release tarballs are available at:
595
source: <pull.1266.v5.git.1658342304.gitgitgadget@gmail.com>
596
597
682
-* kk/p4-client-name-encoding-fix (2022-07-21) 2 commits
683
- (merged to 'next' on 2022-07-21 at 008518b4e5)
684
- + git-p4: refactoring of p4CmdList()
685
- (merged to 'next' on 2022-07-11 at 9c18616f76)
686
- + git-p4: fix bug with encoding of p4 client name
687
-
688
- "git p4" did not handle non-ASCII client name well, which has been
689
- corrected.
690
-
691
- Will merge to 'master'.
692
- source: <pull.1285.v3.git.git.1658394440.gitgitgadget@gmail.com>
693
-
694
-
598
* sa/cat-file-mailmap (2022-07-18) 4 commits
599
(merged to 'next' on 2022-07-27 at 59c4eb32b3)
600
+ cat-file: add mailmap support
@@ -706,29 +609,6 @@ Release tarballs are available at:
609
source: <20220718195102.66321-1-siddharthasthana31@gmail.com>
610
611
709
-* ds/rebase-update-ref (2022-07-19) 13 commits
710
- (merged to 'next' on 2022-07-20 at 9f4bf9ef6c)
711
- + sequencer: notify user of --update-refs activity
712
- + sequencer: ignore HEAD ref under --update-refs
713
- + rebase: add rebase.updateRefs config option
714
- + sequencer: rewrite update-refs as user edits todo list
715
- + rebase: update refs from 'update-ref' commands
716
- + rebase: add --update-refs option
717
- + sequencer: add update-ref command
718
- + sequencer: define array with enum values
719
- + rebase-interactive: update 'merge' description
720
- + branch: consider refs under 'update-refs'
721
- + t2407: test branches currently using apply backend
722
- + t2407: test bisect and rebase as black-boxes
723
- + Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref
724
-
725
- "git rebase -i" learns to update branches whose tip appear in the
726
- rebased range.
727
-
728
- Will merge to 'master'.
729
- source: <pull.1247.v5.git.1658255624.gitgitgadget@gmail.com>
730
-
731
-
612
* pw/xdiff-alloc (2022-07-08) 4 commits
613
(merged to 'next' on 2022-07-25 at 92a39a5ff2)
614
+ xdiff: introduce XDL_ALLOC_GROW()