What's cooking (2023/11 #06)
Junio C Hamano committed
Nov 15, 2023 at 02:08 UTC
c3a10c1c70dcc38a814b74eae3897401f4d0fb19
1 file changed
+80
-65
whats-cooking.txt
+80
-65
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2023, #05; Mon, 13)
3
-X-master-at: e0939bec273052b1a8d69db4a3f7c87aaf83e220
4
-X-next-at: 309e3ec6dda82ab1e7b7722ef344e6c5d0c0964b
2
+Subject: What's cooking in git.git (Nov 2023, #06; Tue, 14)
3
+X-master-at: cfb8a6e9a93adbe81efca66e6110c9b4d2e57169
4
+X-next-at: 8631bc74722bb0614b8db08fb17e94121449d13f
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2023, #05; Mon, 13)
7
+What's cooking in git.git (Nov 2023, #06; Tue, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,11 +17,7 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
-The first candidate for the upcoming release, Git 2.43.0-rc0, has
21
-been tagged. As of now, 'next' is "empty" in the sense that its
22
-tree is identical to that of 'master'. There are tons of topic
23
-waiting outside 'next' without sufficient support, which is sad, but
24
-they are of lower priority now for a few weeks X-<.
20
+Git 2.43-rc2 has been tagged.
21
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
@@ -54,6 +50,62 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[New Topics]
52
53
+* js/ci-discard-prove-state (2023-11-14) 1 commit
54
+ (merged to 'next' on 2023-11-14 at fade3ba143)
55
+ + ci: avoid running the test suite _twice_
56
+ (this branch uses ps/ci-gitlab.)
57
+
58
+ The way CI testing used "prove" could lead to running the test
59
+ suite twice needlessly, which has been corrected.
60
+
61
+ Will cook in 'next'.
62
+ source: <pull.1613.git.1699894837844.gitgitgadget@gmail.com>
63
+
64
+--------------------------------------------------
65
+[Stalled]
66
+
67
+* pw/rebase-sigint (2023-09-07) 1 commit
68
+ - rebase -i: ignore signals when forking subprocesses
69
+
70
+ If the commit log editor or other external programs (spawned via
71
+ "exec" insn in the todo list) receive internactive signal during
72
+ "git rebase -i", it caused not just the spawned program but the
73
+ "Git" process that spawned them, which is often not what the end
74
+ user intended. "git" learned to ignore SIGINT and SIGQUIT while
75
+ waiting for these subprocesses.
76
+
77
+ Expecting a reroll.
78
+ cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
79
+ source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
80
+
81
+
82
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
83
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
84
+
85
+ "git cherry-pick A" that replays a single commit stopped before
86
+ clobbering local modification, but "git cherry-pick A..B" did not,
87
+ which has been corrected.
88
+
89
+ Expecting a reroll.
90
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
91
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
92
+
93
+
94
+* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
95
+ - diff-lib: fix check_removed() when fsmonitor is active
96
+ - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
97
+ - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
98
+ (this branch uses jc/fake-lstat.)
99
+
100
+ The optimization based on fsmonitor in the "diff --cached"
101
+ codepath is resurrected with the "fake-lstat" introduced earlier.
102
+
103
+ It is unknown if the optimization is worth resurrecting, but in case...
104
+ source: <xmqqr0n0h0tw.fsf@gitster.g>
105
+
106
+--------------------------------------------------
107
+[Cooking]
108
+
109
* jk/chunk-bounds-more (2023-11-09) 9 commits
110
(merged to 'next' on 2023-11-13 at 3df4b18bea)
111
+ commit-graph: mark chunk error messages for translation
@@ -81,41 +133,42 @@ Release tarballs are available at:
133
134
Portability tweak.
135
84
- Will merge to 'master'.
136
+ Will cook in 'next'.
137
source: <cover.1699596457.git.ps@pks.im>
138
139
140
* ss/format-patch-use-encode-headers-for-cover-letter (2023-11-10) 1 commit
89
- - format-patch: fix ignored encode_email_headers for cover letter
141
+ (merged to 'next' on 2023-11-14 at 1a4bd59e15)
142
+ + format-patch: fix ignored encode_email_headers for cover letter
143
144
"git format-patch --encode-email-headers" ignored the option when
145
preparing the cover letter, which has been corrected.
146
94
- Will merge to 'next'.
147
+ Will cook in 'next'.
148
source: <20231109111950.387219-1-contact@emersion.fr>
149
150
151
* ps/ban-a-or-o-operator-with-test (2023-11-11) 4 commits
99
- - Makefile: stop using `test -o` when unlinking duplicate executables
100
- - contrib/subtree: convert subtree type check to use case statement
101
- - contrib/subtree: stop using `-o` to test for number of args
102
- - global: convert trivial usages of `test <expr> -a/-o <expr>`
152
+ (merged to 'next' on 2023-11-14 at d84471baab)
153
+ + Makefile: stop using `test -o` when unlinking duplicate executables
154
+ + contrib/subtree: convert subtree type check to use case statement
155
+ + contrib/subtree: stop using `-o` to test for number of args
156
+ + global: convert trivial usages of `test <expr> -a/-o <expr>`
157
158
Test and shell scripts clean-up.
159
106
- Will merge to 'next'.
160
+ Will cook in 'next'.
161
source: <cover.1699609940.git.ps@pks.im>
162
163
110
-* vd/glossary-dereference-peel (2023-11-10) 1 commit
164
+* vd/glossary-dereference-peel (2023-11-14) 1 commit
165
- glossary: add definitions for dereference & peel
166
167
"To dereference" and "to peel" were sometimes used in in-code
168
comments and documentation but without description in the glossary.
169
116
- Expecting an update.
117
- cf. <xmqq1qcyxxri.fsf@gitster.g>
118
- source: <pull.1610.git.1699574277143.gitgitgadget@gmail.com>
170
+ Will merge to 'next'.
171
+ source: <pull.1610.v2.git.1699917471769.gitgitgadget@gmail.com>
172
173
174
* ak/rebase-autosquash (2023-11-13) 4 commits
@@ -124,52 +177,13 @@ Release tarballs are available at:
177
- rebase: support --autosquash without -i
178
- rebase: fully ignore rebase.autoSquash without -i
179
127
- source: <20231111132720.78877-1-andy.koppe@gmail.com>
128
-
129
---------------------------------------------------
130
-[Stalled]
131
-
132
-* pw/rebase-sigint (2023-09-07) 1 commit
133
- - rebase -i: ignore signals when forking subprocesses
134
-
135
- If the commit log editor or other external programs (spawned via
136
- "exec" insn in the todo list) receive internactive signal during
137
- "git rebase -i", it caused not just the spawned program but the
138
- "Git" process that spawned them, which is often not what the end
139
- user intended. "git" learned to ignore SIGINT and SIGQUIT while
140
- waiting for these subprocesses.
141
-
142
- Expecting a reroll.
143
- cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
144
- source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
145
-
146
-
147
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
148
- - cherry-pick: refuse cherry-pick sequence if index is dirty
180
+ "git rebase --autosquash" is now enabled for non-interactive rebase,
181
+ but it is still incompatible with the apply backend.
182
150
- "git cherry-pick A" that replays a single commit stopped before
151
- clobbering local modification, but "git cherry-pick A..B" did not,
152
- which has been corrected.
153
-
154
- Expecting a reroll.
155
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
156
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
157
-
158
-
159
-* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
160
- - diff-lib: fix check_removed() when fsmonitor is active
161
- - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
162
- - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
163
- (this branch uses jc/fake-lstat.)
164
-
165
- The optimization based on fsmonitor in the "diff --cached"
166
- codepath is resurrected with the "fake-lstat" introduced earlier.
167
-
168
- It is unknown if the optimization is worth resurrecting, but in case...
169
- source: <xmqqr0n0h0tw.fsf@gitster.g>
183
+ Expecting a (hopefully small and final) reroll.
184
+ cf. <058eb5d9-35d9-4452-8d33-d9cfebb94347@gmail.com>
185
+ source: <20231111132720.78877-1-andy.koppe@gmail.com>
186
171
---------------------------------------------------
172
-[Cooking]
187
188
* vd/for-each-ref-unsorted-optimization (2023-11-07) 9 commits
189
- t/perf: add perf tests for for-each-ref
@@ -213,6 +227,7 @@ Release tarballs are available at:
227
+ ci: group installation of Docker dependencies
228
+ ci: make grouping setup more generic
229
+ ci: reorder definitions for grouping functions
230
+ (this branch is used by js/ci-discard-prove-state.)
231
232
Add support for GitLab CI.
233