1
1
To: git@vger.kernel.org
2
- Subject: What's cooking in git.git (Sep 2024, #11; Thu, 26 )
2
+ Subject: What's cooking in git.git (Sep 2024, #12; Sun, 29 )
3
3
X-master-at: 3857aae53f3633b7de63ad640737c657387ae0c6
4
- X-next-at: e261f169bdc0d967eadb9c1eae13d86b6873c213
4
+ X-next-at: c52b418c92d127f8efa6c22f3765e715a23f2229
5
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
6
7
- What's cooking in git.git (Sep 2024, #11; Thu, 26 )
7
+ What's cooking in git.git (Sep 2024, #12; Sun, 29 )
8
8
--------------------------------------------------
9
9
10
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,7 +17,14 @@ topic without enough support may be discarded after a long period of
17
17
no activity (of course they can be resubmit when new interests
18
18
arise).
19
19
20
- An early preview release Git 2.47-rc0 has been tagged.
20
+ A handful of topics in 'next' will be flushed to 'master' and then
21
+ we will tag -rc1 in the middle of this week.
22
+
23
+ Unfortunately our CI jobs seem to be failing due to
24
+ https://lore.kernel.org/git/xmqqmsk37926.fsf@gitster.g/ The
25
+ regression in libCurl 8.10.0 has been identified and corrected in
26
+ the upstream, but apparently it takes time for the fix to percolate
27
+ down.
21
28
22
29
Copies of the source code to Git live in many repositories, and the
23
30
following is a list of the ones I push into or their mirrors. Some
@@ -48,60 +55,37 @@ Release tarballs are available at:
48
55
https://www.kernel.org/pub/software/scm/git/
49
56
50
57
--------------------------------------------------
51
- [Graduated to 'master']
52
-
53
- * ak/doc-sparse-co-typofix (2024-09-23) 1 commit
54
- (merged to 'next' on 2024-09-24 at 74edc0657c)
55
- + Documentation/technical: fix a typo
56
-
57
- Docfix.
58
- source: <20240920082815.8192-1-algonell@gmail.com>
59
-
60
-
61
- * ak/typofix-builtins (2024-09-24) 1 commit
62
- (merged to 'next' on 2024-09-24 at d7702a68b7)
63
- + builtin: fix typos
64
-
65
- Typofix.
66
- source: <20240924130906.21392-1-algonell@gmail.com>
67
-
68
-
69
- * cb/ci-freebsd-13-4 (2024-09-20) 1 commit
70
- (merged to 'next' on 2024-09-23 at 18be138bfd)
71
- + ci: update FreeBSD image to 13.4
58
+ [New Topics]
72
59
73
- CI updates.
74
- source: <20240920201409.8723-1-carenas@gmail.com>
60
+ * ej/cat-file-remote-object-info (2024-09-27) 6 commits
61
+ - cat-file: add remote-object-info to batch-command
62
+ - cat-file: add declaration of variable i inside its for loop
63
+ - transport: add client support for object-info
64
+ - serve: advertise object-info feature
65
+ - fetch-pack: move fetch initialization
66
+ - fetch-pack: refactor packet writing
75
67
68
+ source: <20240926013856.35527-1-eric.peijian@gmail.com>
76
69
77
- * jk/sendemail-mailmap-doc (2024-09-25) 1 commit
78
- (merged to 'next' on 2024-09-25 at d4f69efebf)
79
- + send-email: document --mailmap and associated configuration
80
70
81
- Docfix.
82
- source: <20240923222429.4102405-1-jacob.e.keller@intel.com>
71
+ * jc/doc-discarding-stalled-topics (2024-09-26) 1 commit
72
+ - howto-maintain-git: discarding inactive topics
83
73
84
-
85
- * rs/diff-exit-code-binary (2024-09-23) 1 commit
86
- (merged to 'next' on 2024-09-24 at 1e597c407c)
87
- + diff: report modified binary files as changes in builtin_diff()
88
-
89
- "git diff --exit-code" ignored modified binary files, which has
90
- been corrected.
91
- source: <500a8e0a-9fbd-4b7b-b2f2-026a4293bc9f@web.de>
74
+ source: <xmqqikuii60q.fsf@gitster.g>
92
75
93
76
--------------------------------------------------
94
77
[Cooking]
95
78
96
79
* ds/sparse-checkout-expansion-advice (2024-09-23) 1 commit
97
- - sparse-checkout: disable advice in 'disable'
80
+ (merged to 'next' on 2024-09-27 at e670bccf7e)
81
+ + sparse-checkout: disable advice in 'disable'
98
82
99
83
When "git sparse-checkout disable" turns a sparse checkout into a
100
84
regular checkout, the index is fully expanded. This totally
101
85
expected behaviour however had an "oops, we are expanding the
102
86
index" advice message, which has been corrected.
103
87
104
- Comments?
88
+ Will merge to 'master'.
105
89
source: <pull.1800.git.1727119882901.gitgitgadget@gmail.com>
106
90
107
91
@@ -119,38 +103,39 @@ Release tarballs are available at:
119
103
120
104
121
105
* jk/http-leakfixes (2024-09-25) 28 commits
122
- - http-push: clean up local_refs at exit
123
- - http-push: clean up loose request when falling back to packed
124
- - http-push: clean up objects list
125
- - http-push: free xml_ctx.cdata after use
126
- - http-push: free remote_ls_ctx.dentry_name
127
- - http-push: free transfer_request strbuf
128
- - http-push: free transfer_request dest field
129
- - http-push: free curl header lists
130
- - http-push: free repo->url string
131
- - http-push: clear refspecs before exiting
132
- - http-walker: free fake packed_git list
133
- - remote-curl: free HEAD ref with free_one_ref()
134
- - http: stop leaking buffer in http_get_info_packs()
135
- - http: call git_inflate_end() when releasing http_object_request
136
- - http: fix leak of http_object_request struct
137
- - http: fix leak when redacting cookies from curl trace
138
- - transport-helper: fix leak of dummy refs_list
139
- - fetch-pack: clear pack lockfiles list
140
- - fetch: free "raw" string when shrinking refspec
141
- - transport-helper: fix strbuf leak in push_refs_with_push()
142
- - send-pack: free cas options before exit
143
- - commit: avoid leaking already-saved buffer
144
- - fetch-pack, send-pack: clean up shallow oid array
145
- - fetch-pack: free object filter before exiting
146
- - connect: clear child process before freeing in diagnostic mode
147
- - fetch-pack: fix leaking sought refs
148
- - shallow: fix leak when unregistering last shallow root
149
- - http-fetch: clear leaking git-index-pack(1) arguments
106
+ (merged to 'next' on 2024-09-27 at c52b418c92)
107
+ + http-push: clean up local_refs at exit
108
+ + http-push: clean up loose request when falling back to packed
109
+ + http-push: clean up objects list
110
+ + http-push: free xml_ctx.cdata after use
111
+ + http-push: free remote_ls_ctx.dentry_name
112
+ + http-push: free transfer_request strbuf
113
+ + http-push: free transfer_request dest field
114
+ + http-push: free curl header lists
115
+ + http-push: free repo->url string
116
+ + http-push: clear refspecs before exiting
117
+ + http-walker: free fake packed_git list
118
+ + remote-curl: free HEAD ref with free_one_ref()
119
+ + http: stop leaking buffer in http_get_info_packs()
120
+ + http: call git_inflate_end() when releasing http_object_request
121
+ + http: fix leak of http_object_request struct
122
+ + http: fix leak when redacting cookies from curl trace
123
+ + transport-helper: fix leak of dummy refs_list
124
+ + fetch-pack: clear pack lockfiles list
125
+ + fetch: free "raw" string when shrinking refspec
126
+ + transport-helper: fix strbuf leak in push_refs_with_push()
127
+ + send-pack: free cas options before exit
128
+ + commit: avoid leaking already-saved buffer
129
+ + fetch-pack, send-pack: clean up shallow oid array
130
+ + fetch-pack: free object filter before exiting
131
+ + connect: clear child process before freeing in diagnostic mode
132
+ + fetch-pack: fix leaking sought refs
133
+ + shallow: fix leak when unregistering last shallow root
134
+ + http-fetch: clear leaking git-index-pack(1) arguments
150
135
151
136
Leakfixes.
152
137
153
- Needs review .
138
+ Will merge to 'master' .
154
139
source: <20240924214930.GA1143523@coredump.intra.peff.net>
155
140
156
141
@@ -260,37 +245,38 @@ Release tarballs are available at:
260
245
source: <pull.1799.git.1726837642511.gitgitgadget@gmail.com>
261
246
262
247
263
- * ps/leakfixes-part-7 (2024-09-16) 24 commits
264
- - diffcore-break: fix leaking filespecs when merging broken pairs
265
- - revision: fix leaking parents when simplifying commits
266
- - builtin/maintenance: fix leak in `get_schedule_cmd()`
267
- - builtin/maintenance: fix leaking config string
268
- - promisor-remote: fix leaking partial clone filter
269
- - grep: fix leaking grep pattern
270
- - submodule: fix leaking submodule ODB paths
271
- - trace2: destroy context stored in thread-local storage
272
- - builtin/difftool: plug several trivial memory leaks
273
- - builtin/repack: fix leaking configuration
274
- - diffcore-order: fix leaking buffer when parsing orderfiles
275
- - parse-options: free previous value of `OPTION_FILENAME`
276
- - diff: fix leaking orderfile option
277
- - builtin/pull: fix leaking "ff" option
278
- - dir: fix off by one errors for ignored and untracked entries
279
- - builtin/submodule--helper: fix leaking remote ref on errors
280
- - t/helper: fix leaking subrepo in nested submodule config helper
281
- - builtin/submodule--helper: fix leaking error buffer
282
- - builtin/submodule--helper: clear child process when not running it
283
- - submodule: fix leaking update strategy
284
- - git: fix leaking argv when handling builtins
285
- - builtin/help: fix leaking `html_path` when reading config multiple times
286
- - builtin/help: fix dangling reference to `html_path`
287
- - Merge branch 'ps/leakfixes-part-6' into ps/leakfixes-part-7
248
+ * ps/leakfixes-part-7 (2024-09-27) 24 commits
249
+ (merged to 'next' on 2024-09-27 at 8c1aa7e558)
250
+ + diffcore-break: fix leaking filespecs when merging broken pairs
251
+ + revision: fix leaking parents when simplifying commits
252
+ + builtin/maintenance: fix leak in `get_schedule_cmd()`
253
+ + builtin/maintenance: fix leaking config string
254
+ + promisor-remote: fix leaking partial clone filter
255
+ + grep: fix leaking grep pattern
256
+ + submodule: fix leaking submodule ODB paths
257
+ + trace2: destroy context stored in thread-local storage
258
+ + builtin/difftool: plug several trivial memory leaks
259
+ + builtin/repack: fix leaking configuration
260
+ + diffcore-order: fix leaking buffer when parsing orderfiles
261
+ + parse-options: free previous value of `OPTION_FILENAME`
262
+ + diff: fix leaking orderfile option
263
+ + builtin/pull: fix leaking "ff" option
264
+ + dir: fix off by one errors for ignored and untracked entries
265
+ + builtin/submodule--helper: fix leaking remote ref on errors
266
+ + t/helper: fix leaking subrepo in nested submodule config helper
267
+ + builtin/submodule--helper: fix leaking error buffer
268
+ + builtin/submodule--helper: clear child process when not running it
269
+ + submodule: fix leaking update strategy
270
+ + git: fix leaking argv when handling builtins
271
+ + builtin/help: fix leaking `html_path` when reading config multiple times
272
+ + builtin/help: fix dangling reference to `html_path`
273
+ + Merge branch 'ps/leakfixes-part-6' into ps/leakfixes-part-7
288
274
289
275
More leak-fixes.
290
276
291
- Will merge to 'next'?
277
+ Will merge to 'master'.
292
278
cf. <ZulXjXSozNrXgMUM@pks.im>
293
- source: <cover.1726484308 .git.ps@pks.im>
279
+ source: <cover.1727351062 .git.ps@pks.im>
294
280
295
281
296
282
* ps/reftable-alloc-failures (2024-09-24) 24 commits
@@ -323,7 +309,8 @@ Release tarballs are available at:
323
309
allocation function given to it may fail to allocate and to deal
324
310
with such an error.
325
311
326
- Will merge to 'next'?
312
+ Expecting a reroll (v3).
313
+ cf. <ZvVO73dp4dbtxKi8@pks.im>
327
314
source: <cover.1727158127.git.ps@pks.im>
328
315
329
316
@@ -374,7 +361,7 @@ Release tarballs are available at:
374
361
source: <pull.1785.v2.git.1726692381.gitgitgadget@gmail.com>
375
362
376
363
377
- * tb/weak-sha1-for-tail-sum (2024-09-24 ) 8 commits
364
+ * tb/weak-sha1-for-tail-sum (2024-09-27 ) 8 commits
378
365
- csum-file.c: use unsafe SHA-1 implementation when available
379
366
- Makefile: allow specifying a SHA-1 for non-cryptographic uses
380
367
- hash.h: scaffolding for _unsafe hashing variants
@@ -387,17 +374,10 @@ Release tarballs are available at:
387
374
The checksum at the tail of files are now computed without
388
375
collision detection protection.
389
376
390
- Needs review.
391
- source: <cover.1727199118.git.me@ttaylorr.com>
392
-
393
-
394
- * gt/unit-test-oidset (2024-08-25) 1 commit
395
- - unit-tests: add tests for oidset.h
396
-
397
- Another unit-test.
398
-
399
- Expecting a reroll.
400
- source: <20240824172028.39419-1-shyamthakkar001@gmail.com>
377
+ Will merge to 'next'.
378
+ cf. <20240927035712.GH567395@coredump.intra.peff.net>
379
+ cf. <CABPp-BH3y96DjapzLPJ+vCoChQiD_wR9uLc3QPsXqzSUr4AFvQ@mail.gmail.com>
380
+ source: <cover.1727364141.git.me@ttaylorr.com>
401
381
402
382
403
383
* sj/ref-contents-check (2024-09-18) 5 commits
@@ -478,7 +458,7 @@ Release tarballs are available at:
478
458
vastly pleasant to work with.
479
459
480
460
Reverted out of 'next', and then replaced.
481
- Will merge to 'next'?
461
+ Will merge to 'next'.
482
462
source: <pull.1766.v5.git.1727161730.gitgitgadget@gmail.com>
483
463
484
464
@@ -498,3 +478,14 @@ Release tarballs are available at:
498
478
499
479
Waiting for review responses.
500
480
source: <20240823224630.1180772-1-e@80x24.org>
481
+
482
+ --------------------------------------------------
483
+ [Discarded]
484
+
485
+ * gt/unit-test-oidset (2024-08-25) 1 commit
486
+ . unit-tests: add tests for oidset.h
487
+
488
+ Another unit-test.
489
+
490
+ Has been expecting a reroll for too long.
491
+ source: <20240824172028.39419-1-shyamthakkar001@gmail.com>
0 commit comments