What's cooking (2023/02 #04)
Junio C Hamano committed
Feb 22, 2023 at 15:03 UTC
5074ecde9e0f84e40fa3c49970717761aa5bf6dc
1 file changed
+369
-236
whats-cooking.txt
+369
-236
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2023, #03; Tue, 14)
3
-X-master-at: c867e4fa180bec4750e9b54eb10f459030dbebfd
4
-X-next-at: 0c349d5c3e2f4fa3283bdb20107953df3ec27116
2
+Subject: What's cooking in git.git (Feb 2023, #04; Wed, 22)
3
+X-master-at: 06dd2baa8da4a73421b959ec026a43711b9d77f9
4
+X-next-at: 32e93fb2a9710edfb0503ec4c4616b77bd28bffe
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Feb 2023, #03; Tue, 14)
7
+What's cooking in git.git (Feb 2023, #04; Wed, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,10 +14,6 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
14
considered "accepted" at all. A topic without enough support may be
15
discarded after a long period of no activity.
16
17
-There are security releases, ranging from 2.30.8 to 2.39.2. The
18
-fixes in these releases have already been integrated to the 'master'
19
-branch as well.
20
-
17
Copies of the source code to Git live in many repositories, and the
18
following is a list of the ones I push into or their mirrors. Some
19
repositories have only a subset of branches.
@@ -47,7 +43,54 @@ Release tarballs are available at:
43
https://www.kernel.org/pub/software/scm/git/
44
45
--------------------------------------------------
50
-[New Topics]
46
+[Graduated to 'master']
47
+
48
+* ab/config-h-remove-unused (2023-02-07) 1 commit
49
+ (merged to 'next' on 2023-02-09 at fa83258b81)
50
+ + config.h: remove unused git_configset_add_parameters()
51
+
52
+ Code clean-up.
53
+ source: <patch-1.1-31f4a08c068-20230207T161453Z-avarab@gmail.com>
54
+
55
+
56
+* ab/hook-api-with-stdin (2023-02-08) 5 commits
57
+ (merged to 'next' on 2023-02-13 at 4cb74ecb6b)
58
+ + hook: support a --to-stdin=<path> option
59
+ + sequencer: use the new hook API for the simpler "post-rewrite" call
60
+ + hook API: support passing stdin to hooks, convert am's 'post-rewrite'
61
+ + run-command: allow stdin for run_processes_parallel
62
+ + run-command.c: remove dead assignment in while-loop
63
+
64
+ Extend the run-hooks API to allow feeding data from the standard
65
+ input when running the hook script(s).
66
+ source: <cover-v2-0.5-00000000000-20230208T191924Z-avarab@gmail.com>
67
+
68
+
69
+* ab/retire-scripted-add-p (2023-02-06) 3 commits
70
+ (merged to 'next' on 2023-02-09 at 1b8c7bce7d)
71
+ + docs & comments: replace mentions of "git-add--interactive.perl"
72
+ + add API: remove run_add_interactive() wrapper function
73
+ + add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"
74
+
75
+ Finally retire the scripted "git add -p/-i" implementation and have
76
+ everybody use the one reimplemented in C.
77
+ source: <cover-v2-0.3-00000000000-20230206T225639Z-avarab@gmail.com>
78
+
79
+
80
+* ab/sequencer-unleak (2023-02-06) 8 commits
81
+ (merged to 'next' on 2023-02-09 at 98bff1953f)
82
+ + commit.c: free() revs.commit in get_fork_point()
83
+ + builtin/rebase.c: free() "options.strategy_opts"
84
+ + sequencer.c: always free() the "msgbuf" in do_pick_commit()
85
+ + builtin/rebase.c: fix "options.onto_name" leak
86
+ + builtin/revert.c: move free-ing of "revs" to replay_opts_release()
87
+ + sequencer API users: fix get_replay_opts() leaks
88
+ + sequencer.c: split up sequencer_remove_state()
89
+ + rebase: use "cleanup" pattern in do_interactive_rebase()
90
+
91
+ Plug leaks in sequencer subsystem and its users.
92
+ source: <cover-v4-0.8-00000000000-20230206T190346Z-avarab@gmail.com>
93
+
94
95
* ab/the-index-compatibility (2023-02-10) 6 commits
96
(merged to 'next' on 2023-02-13 at 4f9869d4cf)
@@ -60,19 +103,88 @@ Release tarballs are available at:
103
104
Remove more remaining uses of macros that relies on the_index
105
singleton instance without explicitly spelling it out.
63
-
64
- Will merge to 'master'.
106
source: <cover-v2-0.6-00000000000-20230210T102114Z-avarab@gmail.com>
107
108
68
-* rs/cache-tree-strbuf-growth-fix (2023-02-10) 1 commit
69
- (merged to 'next' on 2023-02-13 at fd9ae8790b)
70
- + cache-tree: fix strbuf growth in prime_cache_tree_rec()
109
+* ab/various-leak-fixes (2023-02-06) 19 commits
110
+ (merged to 'next' on 2023-02-13 at 0cee9746f7)
111
+ + push: free_refs() the "local_refs" in set_refspecs()
112
+ + push: refactor refspec_append_mapped() for subsequent leak-fix
113
+ + receive-pack: release the linked "struct command *" list
114
+ + grep API: plug memory leaks by freeing "header_list"
115
+ + grep.c: refactor free_grep_patterns()
116
+ + builtin/merge.c: free "&buf" on "Your local changes..." error
117
+ + builtin/merge.c: use fixed strings, not "strbuf", fix leak
118
+ + show-branch: free() allocated "head" before return
119
+ + commit-graph: fix a parse_options_concat() leak
120
+ + http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
121
+ + http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
122
+ + worktree: fix a trivial leak in prune_worktrees()
123
+ + repack: fix leaks on error with "goto cleanup"
124
+ + name-rev: don't xstrdup() an already dup'd string
125
+ + various: add missing clear_pathspec(), fix leaks
126
+ + clone: use free() instead of UNLEAK()
127
+ + commit-graph: use free_commit_graph() instead of UNLEAK()
128
+ + bundle.c: don't leak the "args" in the "struct child_process"
129
+ + tests: mark tests as passing with SANITIZE=leak
130
72
- Remove unnecessary explicit sizing of strbuf.
131
+ Leak fixes.
132
+ source: <cover-v7-00.19-00000000000-20230206T230141Z-avarab@gmail.com>
133
74
- Will merge to 'master'.
75
- source: <a37623c8-d2fb-aec6-3423-2d402d717959@web.de>
134
+
135
+* ar/userdiff-java-update (2023-02-08) 3 commits
136
+ (merged to 'next' on 2023-02-09 at f62497382a)
137
+ + userdiff: support Java sealed classes
138
+ + userdiff: support Java record types
139
+ + userdiff: support Java type parameters
140
+
141
+ Userdiff regexp update for Java language.
142
+ source: <20230207234259.452141-1-rybak.a.v@gmail.com>
143
+
144
+
145
+* cb/grep-fallback-failing-jit (2023-01-31) 1 commit
146
+ (merged to 'next' on 2023-02-08 at 3a70d6ef6c)
147
+ + grep: fall back to interpreter if JIT memory allocation fails
148
+
149
+ In an environment where dynamically generated code is prohibited to
150
+ run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
151
+ back to interpreted execution in such a case.
152
+ source: <20230131185611.520311-1-minipli@grsecurity.net>
153
+
154
+
155
+* cw/doc-pushurl-vs-url (2023-02-07) 1 commit
156
+ (merged to 'next' on 2023-02-09 at 21b0678d19)
157
+ + Documentation: clarify multiple pushurls vs urls
158
+
159
+ Doc update.
160
+ source: <20230207181227.361290-1-calvinwan@google.com>
161
+
162
+
163
+* ds/bundle-uri-5 (2023-01-31) 11 commits
164
+ (merged to 'next' on 2023-02-08 at 1ba9ba565d)
165
+ + bundle-uri: test missing bundles with heuristic
166
+ + bundle-uri: store fetch.bundleCreationToken
167
+ + fetch: fetch from an external bundle URI
168
+ + bundle-uri: drop bundle.flag from design doc
169
+ + clone: set fetch.bundleURI if appropriate
170
+ + bundle-uri: download in creationToken order
171
+ + bundle-uri: parse bundle.<id>.creationToken values
172
+ + bundle-uri: parse bundle.heuristic=creationToken
173
+ + t5558: add tests for creationToken heuristic
174
+ + bundle: verify using check_connected()
175
+ + bundle: test unbundling with incomplete history
176
+
177
+ The bundle-URI subsystem adds support for creation-token heuristics
178
+ to help incremental fetches.
179
+ source: <pull.1454.v3.git.1675171759.gitgitgadget@gmail.com>
180
+
181
+
182
+* en/name-rev-make-taggerdate-much-less-important (2023-02-09) 1 commit
183
+ (merged to 'next' on 2023-02-10 at 059bc956aa)
184
+ + name-rev: fix names by dropping taggerdate workaround
185
+
186
+ "git name-rev" heuristics update.
187
+ source: <pull.1468.v3.git.1675933906906.gitgitgadget@gmail.com>
188
189
190
* jk/doc-ls-remote-matching (2023-02-10) 2 commits
@@ -81,47 +193,212 @@ Release tarballs are available at:
193
+ doc/ls-remote: cosmetic cleanups for examples
194
195
Doc update.
196
+ source: <Y+cAdZTs5y0yiTkM@coredump.intra.peff.net>
197
+
198
+
199
+* kf/t5000-modernise (2023-02-06) 1 commit
200
+ (merged to 'next' on 2023-02-09 at 0341c54639)
201
+ + t5000: modernise archive and :(glob) test
202
+
203
+ Test clean-up.
204
+ source: <20230204204124.80741-1-kostya.farber@gmail.com>
205
+
206
+
207
+* po/attributes-text (2023-02-06) 1 commit
208
+ (merged to 'next' on 2023-02-09 at 8be7b134da)
209
+ + .gitattributes: include `text` attribute for eol attributes
210
+
211
+ In-tree .gitattributes update to match the way we recommend our
212
+ users to mark a file as text.
213
+ source: <20230203125920.751-1-philipoakley@iee.email>
214
+
215
+
216
+* rs/cache-tree-strbuf-growth-fix (2023-02-10) 1 commit
217
+ (merged to 'next' on 2023-02-13 at fd9ae8790b)
218
+ + cache-tree: fix strbuf growth in prime_cache_tree_rec()
219
+
220
+ Remove unnecessary explicit sizing of strbuf.
221
+ source: <a37623c8-d2fb-aec6-3423-2d402d717959@web.de>
222
+
223
+
224
+* rs/size-t-fixes (2023-02-06) 2 commits
225
+ (merged to 'next' on 2023-02-09 at 4bf6998479)
226
+ + pack-objects: use strcspn(3) in name_cmp_len()
227
+ + read-cache: use size_t for {base,df}_name_compare()
228
+
229
+ Type fixes.
230
+ source: <7315487c-c97c-b8a2-d3b2-4fbf642495dd@web.de>
231
+
232
+
233
+* wl/new-command-doc (2023-02-06) 1 commit
234
+ (merged to 'next' on 2023-02-09 at 23bcd4d4d9)
235
+ + new-command.txt: update reference to builtin docs
236
+
237
+ Comment fix.
238
+ source: <pull.1451.git.git.1675477659972.gitgitgadget@gmail.com>
239
+
240
+--------------------------------------------------
241
+[New Topics]
242
+
243
+* jc/diff-algo-attribute (2023-02-21) 2 commits
244
+ (merged to 'next' on 2023-02-22 at 2375640330)
245
+ + diff: teach diff to read algorithm from diff driver
246
+ + diff: consolidate diff algorithm option parsing
247
+
248
+ The "diff" drivers specified by the "diff" attribute attached to
249
+ paths can now specify which algorithm (e.g. histogram) to use.
250
251
Will merge to 'master'.
86
- source: <Y+cAdZTs5y0yiTkM@coredump.intra.peff.net>
252
+ source: <pull.1452.v4.git.git.1676927082.gitgitgadget@gmail.com>
253
254
89
-* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
90
- - commit-reach: avoid NULL dereference
255
+* jk/shorten-unambiguous-ref-wo-sscanf (2023-02-15) 3 commits
256
+ - shorten_unambiguous_ref(): avoid sscanf()
257
+ - shorten_unambiguous_ref(): use NUM_REV_PARSE_RULES constant
258
+ - shorten_unambiguous_ref(): avoid integer truncation
259
92
- Under discussion.
93
- cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
94
- source: <20230211111526.2028178-1-e@80x24.org>
260
+ sscanf(3) used in "git symbolic-ref --short" implementation found
261
+ to be not working reliably on macOS in UTF-8 locales. Rewrite the
262
+ code to avoid sscanf() altogether to work it around.
263
264
+ Will merge to 'next'?
265
+ source: <Y+z3MtgayoXsxaHA@coredump.intra.peff.net>
266
97
-* rs/ctype-test (2023-02-13) 3 commits
98
- - test-ctype: test iscntrl, ispunct, isxdigit and isprint
99
- - test-ctype: test islower and isupper
100
- - test-ctype: test isascii
267
102
- Test safe_ctype
268
+* js/gpg-errors (2023-02-15) 2 commits
269
+ (merged to 'next' on 2023-02-16 at 510898ff10)
270
+ + gpg: do show gpg's error message upon failure
271
+ + t7510: add a test case that does not need gpg
272
104
- Will merge to 'next'.
105
- source: <81eee04b-598e-dfe1-f954-3105bcbcb2f2@web.de>
273
+ Error messages given upon a signature verification failure used to
274
+ discard the errors from underlying gpg program, which has been
275
+ corrected.
276
277
+ Will merge to 'master'.
278
+ source: <pull.1480.git.1676440714.gitgitgadget@gmail.com>
279
108
-* mh/credential-password-expiry (2023-02-13) 1 commit
109
- . credential: new attribute password_expiry_utc
280
111
- Seems to break CI only on Windows?
112
- cf. https://github.com/git/git/actions/runs/4169057114/jobs/7217377625
113
- source: <pull.1443.v3.git.git.1675545372271.gitgitgadget@gmail.com>
281
+* jc/genzeros-avoid-raw-write (2023-02-16) 1 commit
282
+ (merged to 'next' on 2023-02-22 at a60fe69bce)
283
+ + test-genzeros: avoid raw write(2)
284
285
+ A test helper had a single write(2) of 256kB, which was too big for
286
+ some platforms (e.g. NonStop), which has been corrected by using
287
+ xwrite() wrapper appropriately.
288
116
-* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
117
- - pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
289
+ Will merge to 'master'.
290
+ source: <xmqqo7putj1t.fsf_-_@gitster.g>
291
119
- In an advice message after failed non-ff pull, we used to suggest
120
- setting pull.rebase=true, but these days pull.rebase=merges may be
121
- more inline with the original spirit of "rebuild your side on top
122
- of theirs".
292
124
- source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
293
+* jk/http-proxy-tests (2023-02-16) 1 commit
294
+ (merged to 'next' on 2023-02-22 at f1f69d188f)
295
+ + add basic http proxy tests
296
+
297
+ Test updates.
298
+
299
+ Will merge to 'master'.
300
+ source: <Y+6YgALh6L9m6rSX@coredump.intra.peff.net>
301
+
302
+
303
+* ps/free-island-marks (2023-02-21) 1 commit
304
+ (merged to 'next' on 2023-02-22 at f46938bce3)
305
+ + delta-islands: fix segfault when freeing island marks
306
+
307
+ Fix on a previous fix already in 'master'.
308
+
309
+ Will merge to 'master'.
310
+ source: <61e490595b80b34c55fd640e093e021ff6fa9591.1676542973.git.ps@pks.im>
311
+
312
+
313
+* tb/drop-dir-iterator-follow-symlink-bit (2023-02-16) 2 commits
314
+ (merged to 'next' on 2023-02-22 at 785e1f323e)
315
+ + t0066: drop setup of "dir5"
316
+ + dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS`
317
+
318
+ Remove leftover and unused code.
319
+
320
+ Will merge to 'master'.
321
+ source: <9bb10b607e46f867a3f8f5c71abf13c990d1ecfe.1676572031.git.me@ttaylorr.com>
322
+ source: <CAGdrTFhHBU2BNYdYr7LbOS7i1LOHGjWLw_d5ZJAXxvTKyLiFCA@mail.gmail.com>
323
+
324
+
325
+* jc/countermand-format-attach (2023-02-17) 1 commit
326
+ - format.attach: allow empty value to disable multi-part messages
327
+
328
+ The format.attach configuration variable lacked a way to override a
329
+ value defined in a lower-priority configuration file (e.g. the
330
+ system one) by redefining it in a higher-priority configuration
331
+ file. Now, setting format.attach to an empty string means show the
332
+ patch inline in the e-mail message, without using MIME attachment.
333
+
334
+ This is a backward incompatible change.
335
+
336
+ Will merge to 'next'?
337
+ source: <xmqqwn4fkgtq.fsf@gitster.g>
338
+
339
+
340
+* rs/archive-mtime (2023-02-18) 1 commit
341
+ - archive: add --mtime
342
+
343
+ "git archive HEAD^{tree}" records the paths with the current
344
+ timestamp in the archive, making it harder to obtain a stable
345
+ output. The command learned the --mtime option to specify an
346
+ arbitrary timestamp (e.g. --mtime="@0 +0000" for the epoch).
347
+
348
+ Will merge to 'next'?
349
+ source: <91a73f5d-ca3e-6cb0-4ba3-38d703074ee6@web.de>
350
+
351
+
352
+* ap/t2015-style-update (2023-02-21) 1 commit
353
+ (merged to 'next' on 2023-02-22 at 40883b85c7)
354
+ + t2015-checkout-unborn.sh: changes the style for cd
355
+
356
+ Test clean-up.
357
+
358
+ Will merge to 'master'.
359
+ source: <20230218192128.7963-1-ashutosh.pandeyhlr007@gmail.com>
360
+
361
+
362
+* if/simplify-trace-setup (2023-02-21) 1 commit
363
+ - trace.c, git.c: remove unnecessary parameter to trace_repo_setup()
364
+
365
+ Code clean-up.
366
+
367
+ Will merge to 'next'?
368
+ source: <20230219002527.84315-1-mcsm224@gmail.com>
369
+
370
+
371
+* ma/fetch-parallel-use-online-cpus (2023-02-21) 1 commit
372
+ (merged to 'next' on 2023-02-22 at 756d379bf0)
373
+ + fetch: choose a sensible default with --jobs=0 again
374
+
375
+ "git fetch --jobs=0" used to hit a BUG(), which has been corrected
376
+ to use the available CPUs.
377
+
378
+ Will merge to 'master'.
379
+ source: <pull.1483.git.1676928805555.gitgitgadget@gmail.com>
380
+
381
+
382
+* pw/rebase-i-validate-labels-early (2023-02-21) 1 commit
383
+ (merged to 'next' on 2023-02-22 at 9b37d42d24)
384
+ + rebase -i: check labels and refs when parsing todo list
385
+
386
+ An invalid label or ref in the "rebase -i" todo file used to
387
+ trigger an runtime error. SUch an error is now diagnosed while the
388
+ todo file is parsed.
389
+
390
+ Will merge to 'master'.
391
+ source: <pull.1482.v2.git.1676902774366.gitgitgadget@gmail.com>
392
+
393
+
394
+* tl/range-diff-custom-abbrev (2023-02-21) 1 commit
395
+ (merged to 'next' on 2023-02-22 at 49db7cce13)
396
+ + range-diff: let '--abbrev' option takes effect
397
+
398
+ "git range-diff" learned --abbrev=<num> option.
399
+
400
+ Will merge to 'master'.
401
+ source: <20230220142444.18739-2-tenglong.tl@alibaba-inc.com>
402
403
--------------------------------------------------
404
[Stalled]
@@ -140,19 +417,14 @@ Release tarballs are available at:
417
source: <20230109173227.29264-1-jacobabel@nullpo.dev>
418
419
143
-* tl/notes--blankline (2022-11-09) 5 commits
144
- - notes.c: introduce "--no-blank-line" option
145
- - notes.c: provide tips when target and append note are both empty
146
- - notes.c: drop unreachable code in 'append_edit()'
147
- - notes.c: cleanup for "designated init" and "char ptr init"
420
+* tl/notes--blankline (2023-02-16) 3 commits
421
+ - notes.c: introduce "--separator" option
422
+ - notes.c: cleanup for "designated init"
423
- notes.c: cleanup 'strbuf_grow' call in 'append_edit'
424
150
- 'git notes append' was taught '--[no-]blank-line' to conditionally
151
- add a LF between a new and existing note.
152
-
153
- Expecting a reroll.
154
- cf. <CAPig+cRcezSp4Rqt1Y9bD-FT6+7b0g9qHfbGRx65AOnw2FQXKg@mail.gmail.com>
155
- source: <cover.1667980450.git.dyroneteng@gmail.com>
425
+ 'git notes append' was taught '--separator' to specify string to insert
426
+ between paragraphs.
427
+ source: <cover.1676551077.git.dyroneteng@gmail.com>
428
429
430
* ab/tag-object-type-errors (2022-11-22) 5 commits
@@ -219,101 +491,46 @@ Release tarballs are available at:
491
--------------------------------------------------
492
[Cooking]
493
222
-* ab/config-h-remove-unused (2023-02-07) 1 commit
223
- (merged to 'next' on 2023-02-09 at fa83258b81)
224
- + config.h: remove unused git_configset_add_parameters()
225
-
226
- Code clean-up.
227
-
228
- Will merge to 'master'.
229
- source: <patch-1.1-31f4a08c068-20230207T161453Z-avarab@gmail.com>
230
-
231
-
232
-* ab/retire-scripted-add-p (2023-02-06) 3 commits
233
- (merged to 'next' on 2023-02-09 at 1b8c7bce7d)
234
- + docs & comments: replace mentions of "git-add--interactive.perl"
235
- + add API: remove run_add_interactive() wrapper function
236
- + add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"
237
-
238
- Finally retire the scripted "git add -p/-i" implementation and have
239
- everybody use the one reimplemented in C.
240
-
241
- Will merge to 'master'.
242
- source: <cover-v2-0.3-00000000000-20230206T225639Z-avarab@gmail.com>
243
-
244
-
245
-* ar/userdiff-java-update (2023-02-08) 3 commits
246
- (merged to 'next' on 2023-02-09 at f62497382a)
247
- + userdiff: support Java sealed classes
248
- + userdiff: support Java record types
249
- + userdiff: support Java type parameters
250
-
251
- Userdiff regexp update for Java language.
252
-
253
- Will merge to 'master'.
254
- source: <20230207234259.452141-1-rybak.a.v@gmail.com>
255
-
256
-
257
-* cw/doc-pushurl-vs-url (2023-02-07) 1 commit
258
- (merged to 'next' on 2023-02-09 at 21b0678d19)
259
- + Documentation: clarify multiple pushurls vs urls
260
-
261
- Doc update.
262
-
263
- Will merge to 'master'.
264
- source: <20230207181227.361290-1-calvinwan@google.com>
265
-
266
-
267
-* en/name-rev-make-taggerdate-much-less-important (2023-02-09) 1 commit
268
- (merged to 'next' on 2023-02-10 at 059bc956aa)
269
- + name-rev: fix names by dropping taggerdate workaround
270
-
271
- "git name-rev" heuristics update.
272
-
273
- Will merge to 'master'.
274
- source: <pull.1468.v3.git.1675933906906.gitgitgadget@gmail.com>
275
-
276
-
277
-* kf/t5000-modernise (2023-02-06) 1 commit
278
- (merged to 'next' on 2023-02-09 at 0341c54639)
279
- + t5000: modernise archive and :(glob) test
280
-
281
- Test clean-up.
494
+* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
495
+ - commit-reach: avoid NULL dereference
496
283
- Will merge to 'master'.
284
- source: <20230204204124.80741-1-kostya.farber@gmail.com>
497
+ Under discussion.
498
+ cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
499
+ source: <20230211111526.2028178-1-e@80x24.org>
500
501
287
-* po/attributes-text (2023-02-06) 1 commit
288
- (merged to 'next' on 2023-02-09 at 8be7b134da)
289
- + .gitattributes: include `text` attribute for eol attributes
502
+* rs/ctype-test (2023-02-13) 3 commits
503
+ (merged to 'next' on 2023-02-15 at 279f198dec)
504
+ + test-ctype: test iscntrl, ispunct, isxdigit and isprint
505
+ + test-ctype: test islower and isupper
506
+ + test-ctype: test isascii
507
291
- In-tree .gitattributes update to match the way we recommend our
292
- users to mark a file as text.
508
+ Test safe_ctype
509
510
Will merge to 'master'.
295
- source: <20230203125920.751-1-philipoakley@iee.email>
511
+ source: <81eee04b-598e-dfe1-f954-3105bcbcb2f2@web.de>
512
513
298
-* rs/size-t-fixes (2023-02-06) 2 commits
299
- (merged to 'next' on 2023-02-09 at 4bf6998479)
300
- + pack-objects: use strcspn(3) in name_cmp_len()
301
- + read-cache: use size_t for {base,df}_name_compare()
514
+* mh/credential-password-expiry (2023-02-18) 1 commit
515
+ - credential: new attribute password_expiry_utc
516
303
- Type fixes.
517
+ The credential subsystem learned that a password may have an
518
+ explicit expiration.
519
305
- Will merge to 'master'.
306
- source: <7315487c-c97c-b8a2-d3b2-4fbf642495dd@web.de>
520
+ Will merge to 'next'?
521
+ source: <pull.1443.v4.git.git.1676701977347.gitgitgadget@gmail.com>
522
523
309
-* wl/new-command-doc (2023-02-06) 1 commit
310
- (merged to 'next' on 2023-02-09 at 23bcd4d4d9)
311
- + new-command.txt: update reference to builtin docs
524
+* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
525
+ - pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
526
313
- Comment fix.
527
+ In an advice message after failed non-ff pull, we used to suggest
528
+ setting pull.rebase=true, but these days pull.rebase=merges may be
529
+ more inline with the original spirit of "rebuild your side on top
530
+ of theirs".
531
315
- Will merge to 'master'.
316
- source: <pull.1451.git.git.1675477659972.gitgitgadget@gmail.com>
532
+ cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
533
+ source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
534
535
536
* jc/gpg-lazy-init (2023-02-09) 1 commit
@@ -322,10 +539,12 @@ Release tarballs are available at:
539
Instead of forcing each command to choose to honor GPG related
540
configuration variables, make the subsystem lazily initialize
541
itself.
542
+
543
+ Will merge to 'next'?
544
source: <xmqqpmaimvtd.fsf_-_@gitster.g>
545
546
328
-* mc/credential-helper-www-authenticate (2023-02-08) 3 commits
547
+* mc/credential-helper-www-authenticate (2023-02-16) 3 commits
548
- credential: add WWW-Authenticate header to cred requests
549
- http: read HTTP WWW-Authenticate response headers
550
- t5563: add tests for basic and anoymous HTTP access
@@ -333,9 +552,8 @@ Release tarballs are available at:
552
Allow information carried on the WWW-AUthenticate header to be
553
passed to the credential helpers.
554
336
- Expecting a (hopefully minor and final) reroll.
337
- cf. <9012b8a3-4abe-d3c6-41ee-f28931869ad7@github.com>
338
- source: <pull.1352.v8.git.1675711789.gitgitgadget@gmail.com>
555
+ Will merge to 'next'?
556
+ source: <pull.1352.v10.git.1676586881.gitgitgadget@gmail.com>
557
558
559
* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
@@ -347,6 +565,8 @@ Release tarballs are available at:
565
- auto-crlf tests: don't lose exit code in loops and outside tests
566
567
Test clean-up.
568
+
569
+ Will merge to 'next'?
570
source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
571
572
@@ -358,6 +578,7 @@ Release tarballs are available at:
578
Error messages given when working on an unborn branch that is
579
checked out in another worktree have been improvved.
580
581
+ Expecting a reroll.
582
cf. <230207.86cz6l501v.gmgdl@evledraar.gmail.com>
583
source: <2193a4ed-b263-068e-92f8-847dcb053f8c@gmail.com>
584
@@ -373,16 +594,20 @@ Release tarballs are available at:
594
Give a hard dependency on cURL library to build "git imap-send",
595
and remove the code to interact with IMAP server without using cURL.
596
597
+ Expecting a reroll.
598
The 'tunnel' part is still iffy.
599
cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
600
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
601
602
381
-* rd/doc-default-date-format (2023-02-01) 1 commit
382
- - rev-list: clarify git-log default date format
603
+* rd/doc-default-date-format (2023-02-15) 1 commit
604
+ (merged to 'next' on 2023-02-22 at 3818705ca9)
605
+ + rev-list: clarify git-log default date format
606
607
Update --date=default documentation.
385
- source: <20230201155712.86577-1-rafael@dulfer.be>
608
+
609
+ Will merge to 'master'.
610
+ source: <xmqqcz6av3ta.fsf_-_@gitster.g>
611
612
613
* ab/config-multi-and-nonbool (2023-02-07) 10 commits
@@ -398,34 +623,9 @@ Release tarballs are available at:
623
- config tests: cover blind spots in git_die_config() tests
624
625
Assorted config API updates.
401
- source: <cover-v5-00.10-00000000000-20230207T154000Z-avarab@gmail.com>
402
-
403
-
404
-* ab/hook-api-with-stdin (2023-02-08) 5 commits
405
- (merged to 'next' on 2023-02-13 at 4cb74ecb6b)
406
- + hook: support a --to-stdin=<path> option
407
- + sequencer: use the new hook API for the simpler "post-rewrite" call
408
- + hook API: support passing stdin to hooks, convert am's 'post-rewrite'
409
- + run-command: allow stdin for run_processes_parallel
410
- + run-command.c: remove dead assignment in while-loop
411
-
412
- Extend the run-hooks API to allow feeding data from the standard
413
- input when running the hook script(s).
414
-
415
- Will merge to 'master'.
416
- source: <cover-v2-0.5-00000000000-20230208T191924Z-avarab@gmail.com>
417
-
418
-
419
-* cb/grep-fallback-failing-jit (2023-01-31) 1 commit
420
- (merged to 'next' on 2023-02-08 at 3a70d6ef6c)
421
- + grep: fall back to interpreter if JIT memory allocation fails
422
-
423
- In an environment where dynamically generated code is prohibited to
424
- run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
425
- back to interpreted execution in such a case.
626
427
- Will merge to 'master'.
428
- source: <20230131185611.520311-1-minipli@grsecurity.net>
627
+ Will merge to 'next'?
628
+ source: <cover-v5-00.10-00000000000-20230207T154000Z-avarab@gmail.com>
629
630
631
* cb/checkout-same-branch-twice (2023-01-20) 1 commit
@@ -439,23 +639,6 @@ Release tarballs are available at:
639
source: <20230120113553.24655-1-carenas@gmail.com>
640
641
442
-* ab/sequencer-unleak (2023-02-06) 8 commits
443
- (merged to 'next' on 2023-02-09 at 98bff1953f)
444
- + commit.c: free() revs.commit in get_fork_point()
445
- + builtin/rebase.c: free() "options.strategy_opts"
446
- + sequencer.c: always free() the "msgbuf" in do_pick_commit()
447
- + builtin/rebase.c: fix "options.onto_name" leak
448
- + builtin/revert.c: move free-ing of "revs" to replay_opts_release()
449
- + sequencer API users: fix get_replay_opts() leaks
450
- + sequencer.c: split up sequencer_remove_state()
451
- + rebase: use "cleanup" pattern in do_interactive_rebase()
452
-
453
- Plug leaks in sequencer subsystem and its users.
454
-
455
- Will merge to 'master'.
456
- source: <cover-v4-0.8-00000000000-20230206T190346Z-avarab@gmail.com>
457
-
458
-
642
* rj/avoid-switching-to-already-used-branch (2023-01-22) 3 commits
643
- switch: reject if the branch is already checked out elsewhere (test)
644
- rebase: refuse to switch to a branch already checked out elsewhere (test)
@@ -477,8 +660,7 @@ Release tarballs are available at:
660
the original one) even when the branch is already checked out in a
661
different worktree linked to the same repository.
662
480
- Leaning negative. Why is it a good thing?
481
- cf. <xmqqo7qqovp1.fsf@gitster.g>
663
+ Will merge to 'next'?
664
source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
665
666
@@ -494,27 +676,6 @@ Release tarballs are available at:
676
source: <20230120012459.920932-1-michael.strawbridge@amd.com>
677
678
497
-* ds/bundle-uri-5 (2023-01-31) 11 commits
498
- (merged to 'next' on 2023-02-08 at 1ba9ba565d)
499
- + bundle-uri: test missing bundles with heuristic
500
- + bundle-uri: store fetch.bundleCreationToken
501
- + fetch: fetch from an external bundle URI
502
- + bundle-uri: drop bundle.flag from design doc
503
- + clone: set fetch.bundleURI if appropriate
504
- + bundle-uri: download in creationToken order
505
- + bundle-uri: parse bundle.<id>.creationToken values
506
- + bundle-uri: parse bundle.heuristic=creationToken
507
- + t5558: add tests for creationToken heuristic
508
- + bundle: verify using check_connected()
509
- + bundle: test unbundling with incomplete history
510
-
511
- The bundle-URI subsystem adds support for creation-token heuristics
512
- to help incremental fetches.
513
-
514
- Will merge to 'master'.
515
- source: <pull.1454.v3.git.1675171759.gitgitgadget@gmail.com>
516
-
517
-
679
* tc/cat-file-z-use-cquote (2023-01-16) 1 commit
680
- cat-file: quote-format name in error when using -z
681
@@ -541,34 +702,6 @@ Release tarballs are available at:
702
Not quite there yet...
703
source: <20230209000212.1892457-1-calvinwan@google.com>
704
544
-
545
-* ab/various-leak-fixes (2023-02-06) 19 commits
546
- (merged to 'next' on 2023-02-13 at 0cee9746f7)
547
- + push: free_refs() the "local_refs" in set_refspecs()
548
- + push: refactor refspec_append_mapped() for subsequent leak-fix
549
- + receive-pack: release the linked "struct command *" list
550
- + grep API: plug memory leaks by freeing "header_list"
551
- + grep.c: refactor free_grep_patterns()
552
- + builtin/merge.c: free "&buf" on "Your local changes..." error
553
- + builtin/merge.c: use fixed strings, not "strbuf", fix leak
554
- + show-branch: free() allocated "head" before return
555
- + commit-graph: fix a parse_options_concat() leak
556
- + http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
557
- + http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
558
- + worktree: fix a trivial leak in prune_worktrees()
559
- + repack: fix leaks on error with "goto cleanup"
560
- + name-rev: don't xstrdup() an already dup'd string
561
- + various: add missing clear_pathspec(), fix leaks
562
- + clone: use free() instead of UNLEAK()
563
- + commit-graph: use free_commit_graph() instead of UNLEAK()
564
- + bundle.c: don't leak the "args" in the "struct child_process"
565
- + tests: mark tests as passing with SANITIZE=leak
566
-
567
- Leak fixes.
568
-
569
- Will merge to 'master'.
570
- source: <cover-v7-00.19-00000000000-20230206T230141Z-avarab@gmail.com>
571
-
705
--------------------------------------------------
706
[Discarded]
707