Skip to content

Commit 2935a82

Browse files
committed
What's cooking (2024/02 #7)
1 parent 3230a85 commit 2935a82

File tree

1 file changed

+117
-150
lines changed

1 file changed

+117
-150
lines changed

whats-cooking.txt

Lines changed: 117 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
2-
Subject: What's cooking in git.git (Feb 2024, #06; Thu, 15)
3-
X-master-at: 3e0d3cd5c7def4808247caf168e17f2bbf47892b
4-
X-next-at: 4c4623230009152fbd5fe219d2adafef26b50c0f
2+
Subject: What's cooking in git.git (Feb 2024, #07; Tue, 20)
3+
X-master-at: f41f85c9ec8d4d46de0fd5fded88db94d3ec8c11
4+
X-next-at: e91efceb0f2ddd49aa201fe3bd057235203b2dcd
55
66

7-
What's cooking in git.git (Feb 2024, #06; Thu, 15)
7+
What's cooking in git.git (Feb 2024, #07; Tue, 20)
88
--------------------------------------------------
99

1010
Here are the topics that have been cooking in my tree. Commits
@@ -17,9 +17,8 @@ topic without enough support may be discarded after a long period of
1717
no activity (of course they can be resubmit when new interests
1818
arise).
1919

20-
Git 2.44-rc1 has been tagged. This round, let's try having just one
21-
release candidate before the final, which is expected to be tagged
22-
on or around 20th.
20+
Git 2.44-rc2 has been tagged to fix a regression discovered the last
21+
minute. The final release is postponed until later this week.
2322

2423
Copies of the source code to Git live in many repositories, and the
2524
following is a list of the ones I push into or their mirrors. Some
@@ -49,9 +48,103 @@ Release tarballs are available at:
4948

5049
https://www.kernel.org/pub/software/scm/git/
5150

51+
--------------------------------------------------
52+
[Graduated to 'master']
53+
54+
* la/trailer-cleanups (2024-02-19) 1 commit
55+
- trailer: fix comment/cut-line regression with opts->no_divider
56+
57+
Fix to an already-graduated topic.
58+
59+
5260
--------------------------------------------------
5361
[New Topics]
5462

63+
* as/option-names-in-messages (2024-02-16) 5 commits
64+
- revision.c: trivial fix to message
65+
- builtin/clone.c: trivial fix of message
66+
- builtin/remote.c: trivial fix of error message
67+
- transport-helper.c: trivial fix of error message
68+
- rebase: trivial fix of error message
69+
70+
Error message updates.
71+
72+
Expecting a reroll.
73+
74+
75+
76+
* bb/completion-no-grep-into-awk (2024-02-16) 1 commit
77+
(merged to 'next' on 2024-02-19 at 8373f95424)
78+
+ completion: use awk for filtering the config entries
79+
80+
Some parts of command line completion script (in contrib/) have
81+
been micro-optimized.
82+
83+
Will cook in 'next'.
84+
85+
86+
87+
* jb/doc-interactive-singlekey-do-not-need-perl (2024-02-19) 1 commit
88+
(merged to 'next' on 2024-02-19 at 9eda75497d)
89+
+ doc: remove outdated information about interactive.singleKey
90+
91+
Doc clean-up.
92+
93+
Will cook in 'next'.
94+
95+
96+
97+
* jk/t0303-clean (2024-02-19) 2 commits
98+
(merged to 'next' on 2024-02-19 at f57b65215f)
99+
+ t0303: check that helper_test_clean removes all credentials
100+
+ Merge branch 'ba/credential-test-clean-fix' into jk/t0303-clean
101+
(this branch uses ba/credential-test-clean-fix.)
102+
103+
Test clean-up.
104+
105+
Will cook in 'next'.
106+
107+
108+
109+
* km/mergetool-vimdiff-layout-fallback (2024-02-19) 1 commit
110+
(merged to 'next' on 2024-02-19 at bf7f086f05)
111+
+ mergetools: vimdiff: use correct tool's name when reading mergetool config
112+
113+
Variants of vimdiff learned to honor mergetool.<variant>.layout settings.
114+
115+
Will cook in 'next'.
116+
117+
118+
119+
* mh/libsecret-empty-password-fix (2024-02-19) 1 commit
120+
(merged to 'next' on 2024-02-19 at b2e17695ca)
121+
+ libsecret: retrieve empty password
122+
123+
Credential helper based on libsecret (in contrib/) has been updated.
124+
125+
Will cook in 'next'.
126+
127+
128+
129+
* ps/reflog-list (2024-02-19) 7 commits
130+
(merged to 'next' on 2024-02-19 at 6c491b5079)
131+
+ builtin/reflog: introduce subcommand to list reflogs
132+
+ refs: stop resolving ref corresponding to reflogs
133+
+ refs: drop unused params from the reflog iterator callback
134+
+ refs/files: sort reflogs returned by the reflog iterator
135+
+ dir-iterator: support iteration in sorted order
136+
+ dir-iterator: pass name to `prepare_next_entry_data()` directly
137+
+ Merge branch 'ps/reftable-backend' into ps/reflog-list
138+
(this branch uses ps/reftable-backend.)
139+
140+
"git reflog" learned a "list" subcommand that enumerates known reflogs.
141+
142+
Will cook in 'next'.
143+
144+
145+
--------------------------------------------------
146+
[Cooking]
147+
55148
* jh/fsmonitor-icase-corner-case-fix (2024-02-14) 11 commits
56149
- t7527: update case-insenstive fsmonitor test
57150
- fsmonitor: refactor bit invalidation in refresh callback
@@ -116,32 +209,36 @@ Release tarballs are available at:
116209

117210

118211
* rj/tag-column-fix (2024-02-14) 1 commit
119-
- tag: error when git-column fails
212+
(merged to 'next' on 2024-02-19 at 9aa52b4ffb)
213+
+ tag: error when git-column fails
120214

121215
"git tag --column" failed to check the exit status of its "git
122216
column" invocation, which has been corrected.
123217

124-
Will merge to 'next'?
218+
Will cook in 'next'.
125219
126220

127221

128222
* jc/am-whitespace-doc (2024-02-14) 1 commit
129-
- doc: add shortcut to "am --whitespace=<action>"
223+
(merged to 'next' on 2024-02-19 at 492f0f9174)
224+
+ doc: add shortcut to "am --whitespace=<action>"
130225

131226
"git am --help" now tells readers what actions are available in
132227
"git am --whitespace=<action>", in addition to saying that the
133228
option is passed through to the underlying "git apply".
134229

135-
Will merge to 'next'?
230+
Will cook in 'next'.
136231
137232

138233

139234
* ba/credential-test-clean-fix (2024-02-15) 1 commit
140-
- t/lib-credential: clean additional credential
235+
(merged to 'next' on 2024-02-19 at 290708b10a)
236+
+ t/lib-credential: clean additional credential
237+
(this branch is used by jk/t0303-clean.)
141238

142239
Test clean-up.
143240

144-
Will merge to 'next'?
241+
Will cook in 'next'.
145242
146243

147244

@@ -154,117 +251,6 @@ Release tarballs are available at:
154251
May want to roll it into the base topic.
155252
156253

157-
--------------------------------------------------
158-
[Graduated to 'master']
159-
160-
* cp/git-flush-is-an-env-bool (2024-02-13) 1 commit
161-
(merged to 'next' on 2024-02-13 at c0850f5675)
162-
+ write-or-die: fix the polarity of GIT_FLUSH environment variable
163-
164-
Recent conversion to allow more than 0/1 in GIT_FLUSH broke the
165-
mechanism by flipping what yes/no means by mistake, which has been
166-
corrected.
167-
168-
Will merge to 'master' and then to 'maint'
169-
170-
171-
172-
* jc/github-actions-update (2024-02-02) 3 commits
173-
(merged to 'next' on 2024-02-07 at 2cd6caaf70)
174-
+ Merge branch 'jc/maint-github-actions-update' into jc/github-actions-update
175-
+ GitHub Actions: update to github-script@v7
176-
+ GitHub Actions: update to checkout@v4
177-
(this branch is used by js/github-actions-update.)
178-
179-
Squelch node.js 16 deprecation warnings from GitHub Actions CI
180-
by updating actions/github-script and actions/checkout that use
181-
node.js 20.
182-
183-
184-
185-
* jc/unit-tests-make-relative-fix (2024-02-12) 1 commit
186-
(merged to 'next' on 2024-02-12 at 554eddef80)
187-
+ unit-tests: do show relative file paths on non-Windows, too
188-
189-
The mechanism to report the filename in the source code, used by
190-
the unit-test machinery, assumed that the compiler expanded __FILE__
191-
to the path to the source given to the $(CC), but some compilers
192-
give full path, breaking the output. This has been corrected.
193-
194-
195-
196-
* js/check-null-from-read-object-file (2024-02-06) 1 commit
197-
(merged to 'next' on 2024-02-12 at 3a18369516)
198-
+ Always check the return value of `repo_read_object_file()`
199-
200-
The code paths that call repo_read_object_file() have been
201-
tightened to react to errors.
202-
203-
204-
205-
* js/github-actions-update (2024-02-12) 2 commits
206-
(merged to 'next' on 2024-02-12 at f52de8b126)
207-
+ ci(linux32): add a note about Actions that must not be updated
208-
+ ci: bump remaining outdated Actions versions
209-
(this branch uses jc/github-actions-update.)
210-
211-
Update remaining GitHub Actions jobs to avoid warnings against
212-
using deprecated version of Node.js.
213-
214-
215-
216-
* jx/dirstat-parseopt-help (2024-02-14) 1 commit
217-
(merged to 'next' on 2024-02-14 at 901101e5f5)
218-
+ diff: mark param1 and param2 as placeholders
219-
220-
The mark-up of diff options has been updated to help translators.
221-
source: <3a82f72f33663f162aa41cb20c0fb3b6786971c9.1707900029.git.worldhello.net@gmail.com>
222-
223-
224-
* pb/complete-config (2024-02-12) 4 commits
225-
(merged to 'next' on 2024-02-13 at d09f5e469a)
226-
+ completion: add and use __git_compute_second_level_config_vars_for_section
227-
+ completion: add and use __git_compute_first_level_config_vars_for_section
228-
+ completion: complete 'submodule.*' config variables
229-
+ completion: add space after config variable names also in Bash 3
230-
231-
The command line completion script (in contrib/) learned to
232-
complete configuration variable names better.
233-
cf. <Zcs34kGTqTbIana6@tanuki>
234-
235-
236-
237-
* pw/gc-during-rebase (2024-02-09) 1 commit
238-
(merged to 'next' on 2024-02-12 at d54c5ce325)
239-
+ prune: mark rebase autostash and orig-head as reachable
240-
241-
The sequencer machinery does not use the ref API and instead
242-
records names of certain objects it needs for its correct operation
243-
in temporary files, which makes these objects susceptible to loss
244-
by garbage collection. These temporary files have been added as
245-
starting points for reachability analysis to fix this.
246-
247-
248-
249-
* rs/receive-pack-remove-find-header (2024-02-12) 2 commits
250-
(merged to 'next' on 2024-02-12 at f1bf281e10)
251-
+ receive-pack: use find_commit_header() in check_nonce()
252-
+ receive-pack: use find_commit_header() in check_cert_push_options()
253-
254-
Code simplification.
255-
256-
257-
258-
* vn/rebase-with-cherry-pick-authorship (2024-02-08) 1 commit
259-
(merged to 'next' on 2024-02-09 at ed35d33595)
260-
+ sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands
261-
262-
"git cherry-pick" invoked during "git rebase -i" session lost
263-
the authorship information, which has been corrected.
264-
265-
266-
--------------------------------------------------
267-
[Cooking]
268254

269255
* ps/ref-tests-update-even-more (2024-02-15) 7 commits
270256
(merged to 'next' on 2024-02-15 at 064b2b4089)
@@ -322,17 +308,17 @@ Release tarballs are available at:
322308
323309

324310

325-
* jc/no-lazy-fetch (2024-02-13) 1 commit
311+
* jc/no-lazy-fetch (2024-02-16) 3 commits
312+
- git: extend --no-lazy-fetch to work across subprocesses
313+
- git: document GIT_NO_REPLACE_OBJECTS environment variable
326314
(merged to 'next' on 2024-02-13 at 7c7136e547)
327315
+ git: --no-lazy-fetch option
328316

329317
"git --no-lazy-fetch cmd" allows to run "cmd" while disabling lazy
330318
fetching of objects from the promisor remote, which may be handy
331319
for debugging.
332-
333-
May want to do the environment variable thing as well.
334-
335320
321+
336322

337323

338324
* jc/t9210-lazy-fix (2024-02-08) 1 commit
@@ -383,7 +369,7 @@ Release tarballs are available at:
383369
(merged to 'next' on 2024-02-07 at 1115200acb)
384370
+ ci: add jobs to test with the reftable backend
385371
+ refs: introduce reftable backend
386-
(this branch is used by kn/for-all-refs.)
372+
(this branch is used by kn/for-all-refs and ps/reflog-list.)
387373

388374
Integrate the reftable code into the refs framework as a backend.
389375

@@ -493,26 +479,7 @@ Release tarballs are available at:
493479
494480

495481

496-
* la/trailer-api (2024-02-06) 28 commits
497-
- trailer: introduce "template" term for readability
498-
- trailer_set_*(): put out parameter at the end
499-
- trailer: unify "--trailer ..." arg handling
500-
- trailer: deprecate "new_trailer_item" struct from API
501-
- trailer_add_arg_item(): drop new_trailer_item usage
502-
- trailer: add new helper functions to API
503-
- trailer: prepare to delete "parse_trailers_from_command_line_args()"
504-
- trailer: spread usage of "trailer_block" language
505-
- trailer: retire trailer_info_get() from API
506-
- trailer: make trailer_info struct private
507-
- sequencer: use the trailer iterator
508-
- trailer: teach iterator about non-trailer lines
509-
- trailer: finish formatting unification
510-
- format_trailer_info(): avoid double-printing the separator
511-
- format_trailer_info(): teach it about opts->trim_empty
512-
- trailer: begin formatting unification
513-
- format_trailer_info(): append newline for non-trailer lines
514-
- format_trailer_info(): drop redundant unfold_value()
515-
- format_trailer_info(): use trailer_item objects
482+
* la/trailer-api (2024-02-16) 9 commits
516483
- format_trailers_from_commit(): indirectly call trailer_info_get()
517484
- format_trailer_info(): move "fast path" to caller
518485
- format_trailers(): use strbuf instead of FILE
@@ -524,7 +491,7 @@ Release tarballs are available at:
524491
- trailer: free trailer_info _after_ all related usage
525492

526493
Code clean-up.
527-
source: <pull.1632.v4.git.1707196348[email protected]>
494+
source: <pull.1632.v5.git.1708124950[email protected]>
528495

529496

530497
* cp/apply-core-filemode (2023-12-26) 3 commits

0 commit comments

Comments
 (0)