What's cooking (2024/07 #03)
Junio C Hamano committed
Jul 11, 2024 at 14:29 UTC
86ae2103193b0ee7956a24a048e5df05cb8614e6
1 file changed
+197
-257
whats-cooking.txt
+197
-257
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2024, #02; Mon, 8)
2
+Subject: What's cooking in git.git (Jul 2024, #03; Thu, 11)
3
X-master-at: 557ae147e6cdc9db121269b058c757ac5092f9c9
4
-X-next-at: 0f21945a48084c71d64695aac932748af8ec35cc
4
+X-next-at: 2a221341d9b66d14d948b71e4edd3494e5dd692c
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2024, #02; Mon, 8)
7
+What's cooking in git.git (Jul 2024, #03; Thu, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,260 +45,63 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
---------------------------------------------------
49
-[Graduated to 'master']
50
-
51
-* db/date-underflow-fix (2024-06-25) 2 commits
52
- (merged to 'next' on 2024-06-26 at 8074493d4e)
53
- + date: detect underflow/overflow when parsing dates with timezone offset
54
- + t0006: simplify prerequisites
55
-
56
- date parser updates to be more careful about underflowing epoch
57
- based timestamp.
58
- source: <20240625231248.4070257-1-gitster@pobox.com>
59
-
60
-
61
-* ds/sparse-lstat-caching (2024-06-28) 5 commits
62
- (merged to 'next' on 2024-06-28 at 9efaea181d)
63
- + sparse-index: improve lstat caching of sparse paths
64
- + sparse-index: count lstat() calls
65
- + sparse-index: use strbuf in path_found()
66
- + sparse-index: refactor path_found()
67
- + sparse-checkout: refactor skip worktree retry logic
68
-
69
- The code to deal with modified paths that are out-of-cone in a
70
- sparsely checked out working tree has been optimized.
71
- cf. <CABPp-BFd7Bk68Omdao5LS0sP5bK1WQ7V6dodB5x8EsncNARxNA@mail.gmail.com>
72
- source: <pull.1754.v3.git.1719578605.gitgitgadget@gmail.com>
73
-
74
-
75
-* jc/archive-prefix-with-add-virtual-file (2024-06-26) 1 commit
76
- (merged to 'next' on 2024-06-26 at da3ae88d56)
77
- + archive: document that --add-virtual-file takes full path
78
-
79
- "git archive --add-virtual-file=<path>:<contents>" never paid
80
- attention to the --prefix=<prefix> option but the documentation
81
- said it would. The documentation has been corrected.
82
- source: <xmqq5xubfjuu.fsf_-_@gitster.g>
83
-
84
-
85
-* ps/leakfixes-more (2024-06-11) 30 commits
86
- (merged to 'next' on 2024-06-27 at 9550a05068)
87
- + builtin/blame: fix leaking ignore revs files
88
- + builtin/blame: fix leaking prefixed paths
89
- + blame: fix leaking data for blame scoreboards
90
- + line-range: plug leaking find functions
91
- + merge: fix leaking merge bases
92
- + builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`
93
- + sequencer: fix memory leaks in `make_script_with_merges()`
94
- + builtin/clone: plug leaking HEAD ref in `wanted_peer_refs()`
95
- + apply: fix leaking string in `match_fragment()`
96
- + sequencer: fix leaking string buffer in `commit_staged_changes()`
97
- + commit: fix leaking parents when calling `commit_tree_extended()`
98
- + config: fix leaking "core.notesref" variable
99
- + rerere: fix various trivial leaks
100
- + builtin/stash: fix leak in `show_stash()`
101
- + revision: free diff options
102
- + builtin/log: fix leaking commit list in git-cherry(1)
103
- + merge-recursive: fix memory leak when finalizing merge
104
- + builtin/merge-recursive: fix leaking object ID bases
105
- + builtin/difftool: plug memory leaks in `run_dir_diff()`
106
- + object-name: free leaking object contexts
107
- + builtin/rev-list: fix leaking bitmap index when calculating disk usage
108
- + notes: fix memory leak when pruning notes
109
- + revision: fix leaking display notes
110
- + merge-recursive: fix leaking rename conflict info
111
- + biultin/rev-parse: fix memory leaks in `--parseopt` mode
112
- + bundle: plug leaks in `create_bundle()`
113
- + notes-utils: free note trees when releasing copied notes
114
- + parse-options: fix leaks for users of OPT_FILENAME
115
- + revision: fix memory leak when reversing revisions
116
- + Merge branch 'ps/leakfixes' into ps/leakfixes-more
117
-
118
- More memory leaks have been plugged.
119
- cf. <CAOLa=ZRBrR5X1bQFAEqM3Ovx5G=J9aqdyD2XKrGT9s6j1jEnnQ@mail.gmail.com>
120
- source: <cover.1718095906.git.ps@pks.im>
121
-
122
-
123
-* rj/pager-die-upon-exec-failure (2024-06-25) 1 commit
124
- (merged to 'next' on 2024-06-26 at bfb6361ca8)
125
- + pager: die when paging to non-existing command
126
-
127
- When GIT_PAGER failed to spawn, depending on the code path taken,
128
- we failed immediately (correct) or just spew the payload to the
129
- standard output (incorrect). The code now always fail immediately
130
- when GIT_PAGER fails.
131
- source: <392deded-9eb2-42fa-b6f9-54c22d3ffd33@gmail.com>
132
-
133
-
134
-* ss/doc-eol-attr-fix (2024-06-24) 1 commit
135
- (merged to 'next' on 2024-06-26 at 6b96672a5f)
136
- + doc: fix case error of eol attribute in example
137
-
138
- Doc update.
139
- source: <pull.1736.git.git.1719178817386.gitgitgadget@gmail.com>
140
-
141
-
142
-* tb/path-filter-fix (2024-06-25) 16 commits
143
- (merged to 'next' on 2024-06-27 at a82d734201)
144
- + bloom: introduce `deinit_bloom_filters()`
145
- + commit-graph: reuse existing Bloom filters where possible
146
- + object.h: fix mis-aligned flag bits table
147
- + commit-graph: new Bloom filter version that fixes murmur3
148
- + commit-graph: unconditionally load Bloom filters
149
- + bloom: prepare to discard incompatible Bloom filters
150
- + bloom: annotate filters with hash version
151
- + repo-settings: introduce commitgraph.changedPathsVersion
152
- + t4216: test changed path filters with high bit paths
153
- + t/helper/test-read-graph: implement `bloom-filters` mode
154
- + bloom.h: make `load_bloom_filter_from_graph()` public
155
- + t/helper/test-read-graph.c: extract `dump_graph_info()`
156
- + gitformat-commit-graph: describe version 2 of BDAT
157
- + commit-graph: ensure Bloom filters are read with consistent settings
158
- + revision.c: consult Bloom filters for root commits
159
- + t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()`
160
-
161
- The Bloom filter used for path limited history traversal was broken
162
- on systems whose "char" is unsigned; update the implementation and
163
- bump the format version to 2.
164
- source: <cover.1719333276.git.me@ttaylorr.com>
165
-
166
-
167
-* xx/bundie-uri-fixes (2024-06-20) 3 commits
168
- (merged to 'next' on 2024-06-27 at 2045d9dbc2)
169
- + unbundle: extend object verification for fetches
170
- + fetch-pack: expose fsckObjects configuration logic
171
- + bundle-uri: verify oid before writing refs
172
-
173
- When bundleURI interface fetches multiple bundles, Git failed to
174
- take full advantage of all bundles and ended up slurping duplicated
175
- objects.
176
- source: <pull.1730.v8.git.1718770053.gitgitgadget@gmail.com>
177
-
48
--------------------------------------------------
49
[New Topics]
50
181
-* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit
182
- - checkout: special case error messages during noop switching
183
-
184
- "git checkout --ours" (no other arguments) complained that the
185
- option is incompatible with branch switching, which is technically
186
- correct, but found confusing by some users. It now says that the
187
- user needs to give pathspec to specify what paths to checkout.
188
-
189
- Needs review.
190
- source: <xmqqikxnqzz4.fsf@gitster.g>
191
-
192
-
193
-* jc/disable-push-nego-for-deletion (2024-07-02) 1 commit
194
- (merged to 'next' on 2024-07-08 at 18411fb8ac)
195
- + push: avoid showing false negotiation errors
196
-
197
- "git push" that pushes only deletion gave an unnecessary and
198
- harmless error message when push negotiation is configured, which
199
- has been corrected.
200
-
201
- Will merge to 'master'.
202
- source: <xmqqo77fr2h0.fsf@gitster.g>
203
-
204
-
205
-* bc/gitfaq-more (2024-07-03) 4 commits
206
- - doc: mention that proxies must be completely transparent
207
- - gitfaq: add entry about syncing working trees
208
- - gitfaq: give advice on using eol attribute in gitattributes
209
- - gitfaq: add documentation on proxies
210
-
211
- A handful of entries are added to the GitFAQ document.
212
-
213
- Expecting a (hopefully small and final) reroll.
214
- cf. <ZocPrtrOVTqSeUTY@tapette.crustytoothpaste.net>
215
- source: <20240704003818.750223-1-sandals@crustytoothpaste.net>
216
-
217
-
218
-* cp/unit-test-reftable-merged (2024-07-03) 5 commits
219
- - t-reftable-merged: add test for REFTABLE_FORMAT_ERROR
220
- - t-reftable-merged: use reftable_ref_record_equal to compare ref records
221
- - t-reftable-merged: add tests for reftable_merged_table_max_update_index
222
- - t: harmonize t-reftable-merged.c with coding guidelines
223
- - t: move reftable/merged_test.c to the unit testing framework
224
-
225
- Another reftable test has been ported to use the unit test framework.
226
-
227
- Expecting a (hopefully small and final) reroll.
228
- cf. <CAOLa=ZSTb-kKiGHkGJwSgx3acxcfFe_+KGW=p7O7B7=CgeX7rw@mail.gmail.com>
229
- source: <20240703171131.3929-1-chandrapratap3519@gmail.com>
230
-
231
-
232
-* ds/advice-sparse-index-expansion (2024-07-08) 1 commit
233
- - advice: warn when sparse index expands
234
-
235
- A new warning message is issued when a command has to expand a
236
- sparse index to handle working tree cruft that are outside of the
237
- sparse checkout.
238
-
239
- Will merge to 'next'?
240
- source: <pull.1756.v2.git.1720448038745.gitgitgadget@gmail.com>
241
-
242
-
243
-* am/gitweb-feed-use-committer-date (2024-07-07) 1 commit
244
- (merged to 'next' on 2024-07-08 at 65215ab842)
245
- + gitweb: rss/atom change published/updated date to committer date
51
+* jc/where-is-bash-for-ci (2024-07-08) 1 commit
52
+ (merged to 'next' on 2024-07-09 at 14b00e672e)
53
+ + ci: unify bash calling convention
54
247
- GitWeb update to use committer date consistently in rss/atom feeds.
55
+ Shell script clean-up.
56
57
Will merge to 'master'.
250
- source: <20240707184813.33166-1-080ariel@gmail.com>
58
+ source: <xmqqwmlvcx9g.fsf_-_@gitster.g>
59
60
253
-* rs/clang-format-updates (2024-07-06) 1 commit
254
- (merged to 'next' on 2024-07-08 at d2b5b41844)
255
- + clang-format: include kh_foreach* macros in ForEachMacros
61
+* kn/push-empty-fix (2024-07-09) 1 commit
62
+ - builtin/push: call set_refspecs after validating remote
63
257
- Custom control structures we invented more recently have been
258
- taught to the clang-format file.
64
+ "git push '' HEAD:there" used to hit a BUG(); it has been corrected
65
+ to die with "fatal: bad repository ''".
66
260
- Will merge to 'master'.
261
- source: <4e7893f5-2dd9-46cf-8a64-cf780f4e1730@web.de>
67
+ Expecting a reroll.
68
+ cf. <xmqq4j8yflrq.fsf@gitster.g>
69
+ source: <20240709144931.1146528-1-karthik.188@gmail.com>
70
71
264
-* rs/t-strvec-use-test-msg (2024-07-06) 1 commit
265
- (merged to 'next' on 2024-07-08 at c28c2553de)
266
- + t-strvec: use test_msg()
72
+* ad/merge-with-diff-algorithm (2024-07-10) 1 commit
73
+ (merged to 'next' on 2024-07-11 at 2a221341d9)
74
+ + merge-recursive: honor diff.algorithm
75
268
- Unit test clean-up.
76
+ Many Porcelain commands that internally use the merge machinery
77
+ were taught to consistently honor the diff.algorithm configuration.
78
79
Will merge to 'master'.
271
- source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de>
80
+ source: <pull.1743.v2.git.git.1720551701648.gitgitgadget@gmail.com>
81
82
274
-* tb/dev-build-pedantic-fix (2024-07-06) 1 commit
275
- (merged to 'next' on 2024-07-08 at 7f34cc6c5b)
276
- + config.mak.dev: fix typo when enabling -Wpedantic
83
+* jc/http-cookiefile (2024-07-09) 1 commit
84
+ (merged to 'next' on 2024-07-11 at abdd5711d2)
85
+ + http.c: cookie file tightening
86
278
- Developer build procedure fix.
87
+ The http.cookieFile and http.saveCookies configuration variables
88
+ have a few values that need to be avoided, which are now ignored
89
+ with warning messages.
90
91
Will merge to 'master'.
281
- source: <cbc9446b1b0f2453b96aa9c0d89b9ec086a619bd.1720205457.git.me@ttaylorr.com>
282
-
283
-
284
-* gt/unit-test-hashmap (2024-07-08) 1 commit
285
- - t: port helper/test-hashmap.c to unit-tests/t-hashmap.c
92
+ source: <xmqqed82cgmj.fsf@gitster.g>
93
287
- An existing test of hashmap API has been rewritten with the
288
- unit-test framework.
94
290
- Needs review.
291
- source: <20240708161641.10335-2-shyamthakkar001@gmail.com>
95
+* jk/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit
96
+ (merged to 'next' on 2024-07-11 at cec8ebb668)
97
+ + add-patch: handle splitting hunks with diff.suppressBlankEmpty
98
293
-
294
-* ri/doc-show-branch-fix (2024-07-08) 1 commit
295
- (merged to 'next' on 2024-07-08 at efcb154dfe)
296
- + doc: fix the max number of branches shown by "show-branch"
297
-
298
- Docfix.
99
+ When the diff.suppressBlankEmpty configuration variable is set,
100
+ "git add -p" failed to process a patch with an unmodified empty
101
+ line, which has been corrected.
102
103
Will merge to 'master'.
301
- source: <pull.1757.v5.git.1720444080034.gitgitgadget@gmail.com>
104
+ source: <20240710093610.GA2076910@coredump.intra.peff.net>
105
106
--------------------------------------------------
107
[Stalled]
@@ -317,24 +120,23 @@ Release tarballs are available at:
120
source: <20240612130217.8877-1-chandrapratap3519@gmail.com>
121
122
320
-* sj/ref-fsck (2024-07-03) 9 commits
123
+* sj/ref-fsck (2024-07-10) 10 commits
124
- fsck: add ref content check for files backend
125
- fsck: add ref name check for files backend
126
- files-backend: add unified interface for refs scanning
127
- builtin/fsck: add `git-refs verify` child process
325
- - builtin/refs: add verify subcommand
128
+ - builtin/refs: add verify subcommand and verbose_refs for "fsck_options"
129
- refs: set up ref consistency check infrastructure
327
- - fsck: add refs-related options and error report function
130
+ - fsck: add refs-related error report function
131
- fsck: add a unified interface for reporting fsck messages
329
- - fsck: rename "skiplist" to "oid_skiplist"
132
+ - fsck: rename objects-related fsck error functions
133
+ - fsck: rename "skiplist" to "skip_oids"
134
135
"git fsck" infrastructure has been taught to also check the sanity
136
of the ref database, in addition to the object database.
137
138
Needs review.
335
- cf. <ysrjjyksfwto35ug7o6xbgbu53vvjso6nov3u2q6vvdprolqwh@vjhcc4x45j7t>
336
- cf. <adijctr2gmmyydpnnrmnu5p5n7mambfrd2ylqm6jtmvv2jdlxo@fbmhti7b4tks>
337
- source: <ZoVX6sn2C9VIeZ38@ArchLinux>
139
+ source: <Zo6eJi8BePrQxTQV@ArchLinux>
140
141
142
* cp/unit-test-reftable-pq (2024-06-14) 7 commits
@@ -431,6 +233,131 @@ Release tarballs are available at:
233
--------------------------------------------------
234
[Cooking]
235
236
+* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit
237
+ - checkout: special case error messages during noop switching
238
+
239
+ "git checkout --ours" (no other arguments) complained that the
240
+ option is incompatible with branch switching, which is technically
241
+ correct, but found confusing by some users. It now says that the
242
+ user needs to give pathspec to specify what paths to checkout.
243
+
244
+ Needs review.
245
+ source: <xmqqikxnqzz4.fsf@gitster.g>
246
+
247
+
248
+* jc/disable-push-nego-for-deletion (2024-07-02) 1 commit
249
+ (merged to 'next' on 2024-07-08 at 18411fb8ac)
250
+ + push: avoid showing false negotiation errors
251
+
252
+ "git push" that pushes only deletion gave an unnecessary and
253
+ harmless error message when push negotiation is configured, which
254
+ has been corrected.
255
+
256
+ Will merge to 'master'.
257
+ source: <xmqqo77fr2h0.fsf@gitster.g>
258
+
259
+
260
+* bc/gitfaq-more (2024-07-09) 4 commits
261
+ (merged to 'next' on 2024-07-10 at eeec4009e4)
262
+ + doc: mention that proxies must be completely transparent
263
+ + gitfaq: add entry about syncing working trees
264
+ + gitfaq: give advice on using eol attribute in gitattributes
265
+ + gitfaq: add documentation on proxies
266
+
267
+ A handful of entries are added to the GitFAQ document.
268
+
269
+ Will merge to 'master'.
270
+ source: <20240709233746.445860-1-sandals@crustytoothpaste.net>
271
+
272
+
273
+* cp/unit-test-reftable-merged (2024-07-11) 7 commits
274
+ - t-reftable-merged: add test for REFTABLE_FORMAT_ERROR
275
+ - t-reftable-merged: use reftable_ref_record_equal to compare ref records
276
+ - t-reftable-merged: add tests for reftable_merged_table_max_update_index
277
+ - t-reftable-merged: improve the const-correctness of helper functions
278
+ - t-reftable-merged: improve the test t_merged_single_record()
279
+ - t: harmonize t-reftable-merged.c with coding guidelines
280
+ - t: move reftable/merged_test.c to the unit testing framework
281
+
282
+ Another reftable test has been ported to use the unit test framework.
283
+
284
+ Looking good.
285
+ source: <20240711040854.4602-1-chandrapratap3519@gmail.com>
286
+
287
+
288
+* ds/advice-sparse-index-expansion (2024-07-08) 1 commit
289
+ (merged to 'next' on 2024-07-09 at c821020b13)
290
+ + advice: warn when sparse index expands
291
+
292
+ A new warning message is issued when a command has to expand a
293
+ sparse index to handle working tree cruft that are outside of the
294
+ sparse checkout.
295
+
296
+ Will merge to 'master'.
297
+ source: <pull.1756.v2.git.1720448038745.gitgitgadget@gmail.com>
298
+
299
+
300
+* am/gitweb-feed-use-committer-date (2024-07-07) 1 commit
301
+ (merged to 'next' on 2024-07-08 at 65215ab842)
302
+ + gitweb: rss/atom change published/updated date to committer date
303
+
304
+ GitWeb update to use committer date consistently in rss/atom feeds.
305
+
306
+ Will merge to 'master'.
307
+ source: <20240707184813.33166-1-080ariel@gmail.com>
308
+
309
+
310
+* rs/clang-format-updates (2024-07-06) 1 commit
311
+ (merged to 'next' on 2024-07-08 at d2b5b41844)
312
+ + clang-format: include kh_foreach* macros in ForEachMacros
313
+
314
+ Custom control structures we invented more recently have been
315
+ taught to the clang-format file.
316
+
317
+ Will merge to 'master'.
318
+ source: <4e7893f5-2dd9-46cf-8a64-cf780f4e1730@web.de>
319
+
320
+
321
+* rs/t-strvec-use-test-msg (2024-07-06) 1 commit
322
+ (merged to 'next' on 2024-07-08 at c28c2553de)
323
+ + t-strvec: use test_msg()
324
+
325
+ Unit test clean-up.
326
+
327
+ Will merge to 'master'.
328
+ source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de>
329
+
330
+
331
+* tb/dev-build-pedantic-fix (2024-07-06) 1 commit
332
+ (merged to 'next' on 2024-07-08 at 7f34cc6c5b)
333
+ + config.mak.dev: fix typo when enabling -Wpedantic
334
+
335
+ Developer build procedure fix.
336
+
337
+ Will merge to 'master'.
338
+ source: <cbc9446b1b0f2453b96aa9c0d89b9ec086a619bd.1720205457.git.me@ttaylorr.com>
339
+
340
+
341
+* gt/unit-test-hashmap (2024-07-08) 1 commit
342
+ - t: port helper/test-hashmap.c to unit-tests/t-hashmap.c
343
+
344
+ An existing test of hashmap API has been rewritten with the
345
+ unit-test framework.
346
+
347
+ Needs review.
348
+ source: <20240708161641.10335-2-shyamthakkar001@gmail.com>
349
+
350
+
351
+* ri/doc-show-branch-fix (2024-07-08) 1 commit
352
+ (merged to 'next' on 2024-07-08 at efcb154dfe)
353
+ + doc: fix the max number of branches shown by "show-branch"
354
+
355
+ Docfix.
356
+
357
+ Will merge to 'master'.
358
+ source: <pull.1757.v5.git.1720444080034.gitgitgadget@gmail.com>
359
+
360
+
361
* as/pathspec-h-typofix (2024-07-01) 1 commit
362
(merged to 'next' on 2024-07-02 at ae7cee4189)
363
+ pathspec: fix typo "glossary-context.txt" -> "glossary-content.txt"
@@ -452,17 +379,24 @@ Release tarballs are available at:
379
source: <20240703062958.23262-2-shyamthakkar001@gmail.com>
380
381
455
-* jk/test-body-in-here-doc (2024-07-01) 2 commits
456
- . t: convert some here-doc test bodies
457
- . test-lib: allow test snippets as here-docs
382
+* jk/test-body-in-here-doc (2024-07-10) 10 commits
383
+ (merged to 'next' on 2024-07-11 at 854733cffc)
384
+ + t/.gitattributes: ignore whitespace in chainlint expect files
385
+ + t: convert some here-doc test bodies
386
+ + test-lib: allow test snippets as here-docs
387
+ + chainlint.pl: add tests for test body in heredoc
388
+ + chainlint.pl: recognize test bodies defined via heredoc
389
+ + chainlint.pl: check line numbers in expected output
390
+ + chainlint.pl: force CRLF conversion when opening input files
391
+ + chainlint.pl: do not spawn more threads than we have scripts
392
+ + chainlint.pl: only start threads if jobs > 1
393
+ + chainlint.pl: add test_expect_success call to test snippets
394
395
The test framework learns to take the test body not as a single
396
string but as a here-document.
397
462
- May need a matching change to shell script linter.
463
- cf. <CAPig+cQdioTBinkacLFb7yktm168oB+qyP9MpZtTRE=1aBz5yg@mail.gmail.com>
464
- cf. <20240706060143.GD698153@coredump.intra.peff.net>
465
- source: <20240701220815.GA20293@coredump.intra.peff.net>
398
+ Will merge to 'master'.
399
+ source: <20240710083416.GA2060328@coredump.intra.peff.net>
400
401
402
* rj/t0612-no-longer-leaks (2024-07-01) 1 commit
@@ -485,7 +419,9 @@ Release tarballs are available at:
419
source: <23d41343-54fd-46c6-9d78-369e8009fa0b@gmail.com>
420
421
488
-* rj/test-sanitize-leak-log-fix (2024-07-01) 1 commit
422
+* rj/test-sanitize-leak-log-fix (2024-07-11) 2 commits
423
+ (merged to 'next' on 2024-07-11 at 9961f42025)
424
+ + test-lib: GIT_TEST_SANITIZE_LEAK_LOG enabled by default
425
(merged to 'next' on 2024-07-08 at c7ee7d03e1)
426
+ test-lib: fix GIT_TEST_SANITIZE_LEAK_LOG
427
@@ -494,6 +430,7 @@ Release tarballs are available at:
430
431
Will merge to 'master'.
432
source: <f4ae6e2a-218a-419c-b6c4-59a08be247a0@gmail.com>
433
+ source: <fe8cd0d1-e451-43d0-b033-11bbb6d1ed56@gmail.com>
434
435
436
* rs/simplify-submodule-helper-super-prefix-invocation (2024-07-01) 1 commit
@@ -516,7 +453,8 @@ Release tarballs are available at:
453
454
Unit-test framework clean-up.
455
519
- Will merge to 'next'?
456
+ Expecting a reroll.
457
+ cf. <97390954-49bc-48c4-bab1-95be10717aca@web.de>
458
source: <85b6b8a9-ee5f-42ab-bcbc-49976b30ef33@web.de>
459
460
@@ -555,12 +493,13 @@ Release tarballs are available at:
493
494
495
* cb/send-email-sanitize-trailer-addresses (2024-07-01) 1 commit
558
- - git-send-email: use sanitized address when reading mbox body
496
+ (merged to 'next' on 2024-07-09 at 442a99106a)
497
+ + git-send-email: use sanitized address when reading mbox body
498
499
Address-looking strings found on the trailer are now placed on the
500
Cc: list after running through sanitize_address.
501
563
- Will merge to 'next'?
502
+ Will merge to 'master'.
503
source: <20240701090115.56957-1-csokas.bence@prolan.hu>
504
505
@@ -577,15 +516,15 @@ Release tarballs are available at:
516
source: <20240626205355.GA1009060@coredump.intra.peff.net>
517
518
580
-* bc/http-proactive-auth (2024-07-03) 1 commit
581
- - http: allow authenticating proactively
519
+* bc/http-proactive-auth (2024-07-09) 1 commit
520
+ (merged to 'next' on 2024-07-10 at 29b050bf0e)
521
+ + http: allow authenticating proactively
522
523
The http transport can now be told to send request with
524
authentication material without first getting a 401 response.
525
586
- Getting there.
587
- cf. <xmqqo77d7lkr.fsf@gitster.g>
588
- source: <20240704001748.746429-2-sandals@crustytoothpaste.net>
526
+ Will merge to 'master'.
527
+ source: <20240710000155.947377-2-sandals@crustytoothpaste.net>
528
529
530
* jc/patch-id (2024-06-21) 5 commits
@@ -604,7 +543,8 @@ Release tarballs are available at:
543
544
545
* en/ort-inner-merge-error-fix (2024-07-06) 8 commits
607
- - merge-ort: fix missing early return
546
+ (merged to 'next' on 2024-07-09 at 74bdae0b3b)
547
+ + merge-ort: fix missing early return
548
(merged to 'next' on 2024-06-28 at a85fe270e6)
549
+ merge-ort: convert more error() cases to path_msg()
550
+ merge-ort: upon merge abort, only show messages causing the abort
@@ -617,5 +557,5 @@ Release tarballs are available at:
557
The "ort" merge backend saw one bugfix for a crash that happens
558
when inner merge gets killed, and assorted code clean-ups.
559
620
- Will merge to 'next' and then to 'master'.
560
+ Will merge to 'master'.
561
source: <pull.1748.v2.git.1718766019.gitgitgadget@gmail.com>