What's cooking (2023/05 #01)
Junio C Hamano committed
May 2, 2023 at 15:24 UTC
860208a52f24159c235c7b4acee616b1873d1242
3 files changed
+248
-180
RelUpload
+1
-1
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-kup=../kup/kup
3
+: ${kup=../kup/kup}
4
5
for s in git-*.sig
6
do
round
+2
-1
@@ -41,7 +41,8 @@ do
41
;;
42
sparse)
43
Meta/Make -j16 -- NO_REGEX=NoThanks SPARSE_FLAGS=-Wsparse-error "$t" &&
44
- Meta/Make -j16 -- NO_REGEX=NoThanks clean >/dev/null 2>&1
44
+ Meta/Make -j16 -- NO_REGEX=NoThanks clean >/dev/null 2>&1 &&
45
+ rm -f compat/regex/regex.o
46
;;
47
*)
48
Meta/Make -j16 "$t"
whats-cooking.txt
+245
-178
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2023, #09; Fri, 28)
3
-X-master-at: 48d89b51b3bb8a60580c36731b96a7206ce1e5b9
4
-X-next-at: e96c925001b196247b94383a62a3b9781b57df80
2
+Subject: What's cooking in git.git (May 2023, #01; Tue, 2)
3
+X-master-at: 69c786637d7a7fe3b2b8f7d989af095f5f49c3a8
4
+X-next-at: 97c42697076c706727900ce04889b69df0880a16
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2023, #09; Fri, 28)
7
+What's cooking in git.git (May 2023, #01; Tue, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -47,77 +47,166 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[Graduated to 'master']
49
50
-* jk/gpg-trust-level-fix (2023-04-19) 1 commit
51
- (merged to 'next' on 2023-04-21 at eb8413dc9d)
52
- + gpg-interface: set trust level of missing key to "undefined"
53
-
54
- The "%GT" placeholder for the "--format" option of "git log" and
55
- friends caused BUG() to trigger on a commit signed with an unknown
56
- key, which has been corrected.
57
- source: <20230419012957.GA503941@coredump.intra.peff.net>
58
-
59
-
60
-* tb/enable-cruft-packs-by-default (2023-04-18) 10 commits
61
- (merged to 'next' on 2023-04-21 at 068bf86fc3)
62
- + repository.h: drop unused `gc_cruft_packs`
63
- + builtin/gc.c: make `gc.cruftPacks` enabled by default
64
- + t/t9300-fast-import.sh: prepare for `gc --cruft` by default
65
- + t/t6500-gc.sh: add additional test cases
66
- + t/t6500-gc.sh: refactor cruft pack tests
67
- + t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
68
- + t/t5304-prune.sh: prepare for `gc --cruft` by default
69
- + builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
70
- + builtin/repack.c: fix incorrect reference to '-C'
71
- + pack-write.c: plug a leak in stage_tmp_packfiles()
72
-
73
- When "gc" needs to retain unreachable objects, packing them into
74
- cruft packs (instead of exploding them into loose object files) has
75
- been offered as a more efficient option for some time. Now the use
76
- of cruft packs has been made the default and no longer considered
77
- an experimental feature.
78
- source: <cover.1681850424.git.me@ttaylorr.com>
50
+* ek/completion-use-read-r-to-read-literally (2023-04-20) 1 commit
51
+ (merged to 'next' on 2023-04-24 at 25bf3b808b)
52
+ + completion: suppress unwanted unescaping of `read`
53
+
54
+ The completion script used to use bare "read" without the "-r"
55
+ option to read the contents of various state files, which risked
56
+ getting confused with backslashes in them. This has been
57
+ corrected.
58
+ source: <20230420223800.1698197-1-myoga.murase@gmail.com>
59
+
60
+
61
+* en/ort-finalize-after-0-merges-fix (2023-04-24) 1 commit
62
+ (merged to 'next' on 2023-04-25 at 1bc935225b)
63
+ + merge-ort: fix calling merge_finalize() with no intermediate merge
64
+
65
+ A small API fix to the ort merge strategy backend.
66
+ source: <pull.1518.v2.git.1682194930766.gitgitgadget@gmail.com>
67
+
68
+
69
+* jk/blame-fake-commit-label (2023-04-24) 1 commit
70
+ (merged to 'next' on 2023-04-26 at 85226d9501)
71
+ + blame: use different author name for fake commit generated by --contents
72
+
73
+ The output given by "git blame" that attributes a line to contents
74
+ taken from the file specified by the "--contents" option shows it
75
+ differently from a line attributed to the working tree file.
76
+ source: <20230424193508.2245566-1-jacob.e.keller@intel.com>
77
+
78
+
79
+* jk/misc-null-check-fixes (2023-04-24) 2 commits
80
+ (merged to 'next' on 2023-04-26 at 9500384e9d)
81
+ + fetch_bundle_uri(): drop pointless NULL check
82
+ + notes: clean up confusing NULL checks in init_notes()
83
+
84
+ Code clean-up.
85
+ source: <20230422135455.GA3942740@coredump.intra.peff.net>
86
+
87
+
88
+* tb/ban-strtok (2023-04-27) 6 commits
89
+ (merged to 'next' on 2023-04-27 at cbbfa4a609)
90
+ + banned.h: mark `strtok()` and `strtok_r()` as banned
91
+ + t/helper/test-json-writer.c: avoid using `strtok()`
92
+ + t/helper/test-oidmap.c: avoid using `strtok()`
93
+ + t/helper/test-hashmap.c: avoid using `strtok()`
94
+ + string-list: introduce `string_list_setlen()`
95
+ + string-list: multi-delimiter `string_list_split_in_place()`
96
+
97
+ Mark strtok() and strtok_r() to be banned.
98
+ source: <cover.1682374789.git.me@ttaylorr.com>
99
100
--------------------------------------------------
101
[New Topics]
102
83
-* ah/doc-attributes-text (2023-04-28) 1 commit
84
- - docs: rewrite the documentation of the text and eol attributes
103
+* jc/attr-source-tree (2023-05-01) 1 commit
104
+ - attr: teach "--attr-source=<tree>" global option to "git"
105
86
- Doc update to clarify how text and eol attributes interact to
87
- specify the end-of-line conversion.
106
+ "git --attr-source=<tree> cmd $args" is a new way to have any
107
+ command to read attributes not from the working tree but from the
108
+ given tree object.
109
89
- Needs review.
90
- source: <20230428042221.871095-1-alexhenrie24@gmail.com>
110
+ Will merge to 'next'?
111
+ source: <pull.1470.v4.git.git.1682822352360.gitgitgadget@gmail.com>
112
113
93
-* jw/send-email-update-gmail-insn (2023-04-28) 1 commit
94
- - send-email docs: Remove mention of discontinued gmail feature
114
+* mc/send-email-header-cmd (2023-05-01) 3 commits
115
+ - send-email: detect empty blank lines in command output
116
+ - send-email: add --header-cmd, --no-header-cmd options
117
+ - send-email: extract execute_cmd from recipients_cmd
118
96
- Doc update to drop use of deprecated app-specific password against
97
- gmail.
119
+ "git send-email" learned "--header-cmd=<cmd>" that can inject
120
+ arbitrary e-mail header lines to the outgoing messages.
121
99
- Will merge to 'next'.
100
- source: <20221001104609.18453-1-j.witteveen@gmail.com>
122
+ Will merge to 'next'?
123
+ source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
124
125
103
-* ob/messages-capitalize-exception (2023-04-28) 1 commit
104
- - messages: capitalization and punctuation exceptions
105
- (this branch uses ob/sequencer-i18n-fix.)
126
+* ob/t3501-retitle (2023-05-01) 1 commit
127
+ (merged to 'next' on 2023-05-01 at 52730fcaaa)
128
+ + t/t3501-revert-cherry-pick.sh: clarify scope of the file
129
107
- Message update.
130
+ Retitle a test script with an overly narrow name.
131
109
- Will merge to 'next'.
110
- source: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de>
132
+ Will merge to 'master'.
133
+ source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de>
134
135
113
-* ob/sequencer-i18n-fix (2023-04-28) 1 commit
114
- - sequencer: actually translate report in do_exec()
115
- (this branch is used by ob/messages-capitalize-exception.)
136
+* rs/test-ctype-eof (2023-05-02) 1 commit
137
+ (merged to 'next' on 2023-05-02 at a19201a6a9)
138
+ + test-ctype: check EOF
139
117
- Message update.
140
+ ctype tests have been taught to test EOF, too.
141
+
142
+ Will merge to 'master'.
143
+ source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
144
+
145
+
146
+* tb/credential-long-lines (2023-05-01) 7 commits
147
+ (merged to 'next' on 2023-05-02 at f027002b92)
148
+ + contrib/credential: embiggen fixed-size buffer in wincred
149
+ + contrib/credential: avoid fixed-size buffer in libsecret
150
+ + contrib/credential: .gitignore libsecret build artifacts
151
+ + contrib/credential: remove 'gnome-keyring' credential helper
152
+ + contrib/credential: avoid fixed-size buffer in osxkeychain
153
+ + t/lib-credential.sh: ensure credential helpers handle long headers
154
+ + credential.c: store "wwwauth[]" values in `credential_read()`
155
+
156
+ The implementation of credential helpers used fgets() over fixed
157
+ size buffers to read protocol messages, causing the remainder of
158
+ the folded long line to trigger unexpected behaviour, which has
159
+ been corrected.
160
+
161
+ Will merge to 'master'.
162
+ source: <cover.1682956419.git.me@ttaylorr.com>
163
+
164
+
165
+* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
166
+ - upload-pack: advertise capabilities when cloning empty repos
167
+
168
+ Expecting a minor and hopefully final update.
169
+ cf. <20230501224038.GA1174291@coredump.intra.peff.net>
170
+ source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
171
119
- Will merge to 'next'.
120
- source: <20230428125649.1719796-2-oswald.buddenhagen@gmx.de>
172
+
173
+* ds/fsck-bitmap (2023-05-02) 2 commits
174
+ - fsck: use local repository
175
+ - fsck: verify checksums of all .bitmap files
176
+
177
+ "git fsck" learned to detect bit-flip breakages in the reachability
178
+ bitmap files.
179
+
180
+ Will merge to 'master'.
181
+ source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
182
+
183
+
184
+* gc/trace-bare-repo-setup (2023-05-01) 1 commit
185
+ - setup: trace bare repository setups
186
+
187
+ The tracing mechanism learned to notice and report when
188
+ auto-discovered bare repositories are being used, as allowing so
189
+ without explicitly stating the user intends to do so (with setting
190
+ GIT_DIR for example) can be used with social engineering as an
191
+ attack vector.
192
+
193
+ Will merge to 'next'?
194
+ source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
195
+
196
+
197
+* cw/strbuf-cleanup (2023-05-02) 6 commits
198
+ - strbuf: remove environment variables
199
+ - strbuf: clarify dependency
200
+ - path: move related function to path
201
+ - object-name: move related functions to object-name
202
+ - credential-store: move related functions to credential-store file
203
+ - abspath: move related functions to abspath
204
+
205
+ Move functions that are not about pure string manipulation out of
206
+ strbuf.[ch]
207
+
208
+ Comments?
209
+ source: <20230502211454.1673000-1-calvinwan@google.com>
210
211
--------------------------------------------------
212
[Stalled]
@@ -142,9 +231,9 @@ Release tarballs are available at:
231
232
Code clean-up.
233
145
- May want to discard.
146
- Area maintainer is fairly negative.
234
+ Will merge to 'next'?
235
cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
236
+ cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
237
source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
238
239
@@ -160,14 +249,15 @@ Release tarballs are available at:
249
source: <20230120113553.24655-1-carenas@gmail.com>
250
251
163
-* ob/revert-of-revert (2023-03-28) 1 commit
164
- - sequencer: call a revert of a revert "reapply"
252
+* ob/revert-of-revert (2023-05-01) 1 commit
253
+ - sequencer: beautify subject of reverts of reverts
254
255
Instead of "Revert "Revert "original"", give "Replay "original""
256
as the title for a revert of a revert.
257
169
- Needs more polishing: docs, tests, transitions.
170
- source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de>
258
+ Expecting a hopefully final reroll.
259
+ Looking much better, except for minor cosmetic issues.
260
+ source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
261
262
263
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
@@ -275,15 +365,60 @@ Release tarballs are available at:
365
--------------------------------------------------
366
[Cooking]
367
368
+* ah/doc-attributes-text (2023-05-01) 1 commit
369
+ - docs: rewrite the documentation of the text and eol attributes
370
+
371
+ Doc update to clarify how text and eol attributes interact to
372
+ specify the end-of-line conversion.
373
+
374
+ Will merge to 'next'?
375
+ source: <20230501023533.35370-2-alexhenrie24@gmail.com>
376
+
377
+
378
+* jw/send-email-update-gmail-insn (2023-04-28) 1 commit
379
+ (merged to 'next' on 2023-05-01 at cb5d83ee92)
380
+ + send-email docs: Remove mention of discontinued gmail feature
381
+
382
+ Doc update to drop use of deprecated app-specific password against
383
+ gmail.
384
+
385
+ Will merge to 'master'.
386
+ source: <20221001104609.18453-1-j.witteveen@gmail.com>
387
+
388
+
389
+* ob/messages-capitalize-exception (2023-04-28) 1 commit
390
+ (merged to 'next' on 2023-05-01 at db0ef42b3a)
391
+ + messages: capitalization and punctuation exceptions
392
+ (this branch uses ob/sequencer-i18n-fix.)
393
+
394
+ Message update.
395
+
396
+ Will merge to 'master'.
397
+ source: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de>
398
+
399
+
400
+* ob/sequencer-i18n-fix (2023-04-28) 1 commit
401
+ (merged to 'next' on 2023-05-01 at 242ca8ce15)
402
+ + sequencer: actually translate report in do_exec()
403
+ (this branch is used by ob/messages-capitalize-exception.)
404
+
405
+ Message update.
406
+
407
+ Will merge to 'master'.
408
+ source: <20230428125649.1719796-2-oswald.buddenhagen@gmx.de>
409
+
410
+
411
* hx/negotiator-non-recursive (2023-04-26) 2 commits
279
- - negotiator/skipping: fix some problems in mark_common()
280
- - negotiator/default: avoid stack overflow
412
+ (merged to 'next' on 2023-05-02 at 64f97cc72d)
413
+ + negotiator/skipping: fix some problems in mark_common()
414
+ + negotiator/default: avoid stack overflow
415
416
The implementation of the default "negotiator", used to find common
417
ancestor over the network for object tranfer, used to be recursive;
418
it was updated to be iterative to conserve stackspace usage.
419
286
- Comments?
420
+ Will merge to 'master'.
421
+ cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com>
422
source: <cover.1682513384.git.hanxin.hx@bytedance.com>
423
424
@@ -328,19 +463,6 @@ Release tarballs are available at:
463
source: <cover.1682671758.git.dyroneteng@gmail.com>
464
465
331
-* ek/completion-use-read-r-to-read-literally (2023-04-20) 1 commit
332
- (merged to 'next' on 2023-04-24 at 25bf3b808b)
333
- + completion: suppress unwanted unescaping of `read`
334
-
335
- The completion script used to use bare "read" without the "-r"
336
- option to read the contents of various state files, which risked
337
- getting confused with backslashes in them. This has been
338
- corrected.
339
-
340
- Will merge to 'master'.
341
- source: <20230420223800.1698197-1-myoga.murase@gmail.com>
342
-
343
-
466
* pw/rebase-i-after-failure (2023-04-21) 6 commits
467
- rebase -i: fix adding failed command to the todo list
468
- rebase: fix rewritten list for failed pick
@@ -356,29 +478,6 @@ Release tarballs are available at:
478
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
479
480
359
-* jk/blame-fake-commit-label (2023-04-24) 1 commit
360
- (merged to 'next' on 2023-04-26 at 85226d9501)
361
- + blame: use different author name for fake commit generated by --contents
362
-
363
- The output given by "git blame" that attributes a line to contents
364
- taken from the file specified by the "--contents" option shows it
365
- differently from a line attributed to the working tree file.
366
-
367
- Will merge to 'master'.
368
- source: <20230424193508.2245566-1-jacob.e.keller@intel.com>
369
-
370
-
371
-* jk/misc-null-check-fixes (2023-04-24) 2 commits
372
- (merged to 'next' on 2023-04-26 at 9500384e9d)
373
- + fetch_bundle_uri(): drop pointless NULL check
374
- + notes: clean up confusing NULL checks in init_notes()
375
-
376
- Code clean-up.
377
-
378
- Will merge to 'master'.
379
- source: <20230422135455.GA3942740@coredump.intra.peff.net>
380
-
381
-
481
* jk/parse-commit-with-malformed-ident (2023-04-27) 4 commits
482
(merged to 'next' on 2023-04-28 at cb6ea0412a)
483
+ parse_commit(): describe more date-parsing failure modes
@@ -425,30 +524,33 @@ Release tarballs are available at:
524
525
526
* en/header-split-cache-h-part-2 (2023-04-24) 22 commits
428
- - reftable: ensure git-compat-util.h is the first (indirect) include
429
- - diff.h: reduce unnecessary includes
430
- - object-store.h: reduce unnecessary includes
431
- - commit.h: reduce unnecessary includes
432
- - fsmonitor: reduce includes of cache.h
433
- - cache.h: remove unnecessary headers
434
- - treewide: remove cache.h inclusion due to previous changes
435
- - cache,tree: move basic name compare functions from read-cache to tree
436
- - cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
437
- - hash-ll.h: split out of hash.h to remove dependency on repository.h
438
- - tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
439
- - dir.h: move DTYPE defines from cache.h
440
- - versioncmp.h: move declarations for versioncmp.c functions from cache.h
441
- - ws.h: move declarations for ws.c functions from cache.h
442
- - match-trees.h: move declarations for match-trees.c functions from cache.h
443
- - pkt-line.h: move declarations for pkt-line.c functions from cache.h
444
- - base85.h: move declarations for base85.c functions from cache.h
445
- - copy.h: move declarations for copy.c functions from cache.h
446
- - server-info.h: move declarations for server-info.c functions from cache.h
447
- - packfile.h: move pack_window and pack_entry from cache.h
448
- - symlinks.h: move declarations for symlinks.c functions from cache.h
449
- - treewide: be explicit about dependence on strbuf.h
527
+ (merged to 'next' on 2023-05-01 at 722c412915)
528
+ + reftable: ensure git-compat-util.h is the first (indirect) include
529
+ + diff.h: reduce unnecessary includes
530
+ + object-store.h: reduce unnecessary includes
531
+ + commit.h: reduce unnecessary includes
532
+ + fsmonitor: reduce includes of cache.h
533
+ + cache.h: remove unnecessary headers
534
+ + treewide: remove cache.h inclusion due to previous changes
535
+ + cache,tree: move basic name compare functions from read-cache to tree
536
+ + cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
537
+ + hash-ll.h: split out of hash.h to remove dependency on repository.h
538
+ + tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
539
+ + dir.h: move DTYPE defines from cache.h
540
+ + versioncmp.h: move declarations for versioncmp.c functions from cache.h
541
+ + ws.h: move declarations for ws.c functions from cache.h
542
+ + match-trees.h: move declarations for match-trees.c functions from cache.h
543
+ + pkt-line.h: move declarations for pkt-line.c functions from cache.h
544
+ + base85.h: move declarations for base85.c functions from cache.h
545
+ + copy.h: move declarations for copy.c functions from cache.h
546
+ + server-info.h: move declarations for server-info.c functions from cache.h
547
+ + packfile.h: move pack_window and pack_entry from cache.h
548
+ + symlinks.h: move declarations for symlinks.c functions from cache.h
549
+ + treewide: be explicit about dependence on strbuf.h
550
551
More header clean-up.
552
+
553
+ Will merge to 'master'.
554
source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
555
556
@@ -464,23 +566,19 @@ Release tarballs are available at:
566
567
"git fetch" learned the "--output-format" option that emits what it
568
did in a machine-parseable format.
569
+
570
+ Expecting a review response.
571
source: <cover.1682593865.git.ps@pks.im>
572
573
470
-* en/ort-finalize-after-0-merges-fix (2023-04-24) 1 commit
471
- (merged to 'next' on 2023-04-25 at 1bc935225b)
472
- + merge-ort: fix calling merge_finalize() with no intermediate merge
574
+* ma/gittutorial-fixes (2023-04-20) 2 commits
575
+ (merged to 'next' on 2023-05-02 at bf96011972)
576
+ + gittutorial: wrap literal examples in backticks
577
+ + gittutorial: drop early mention of origin
578
474
- A small API fix to the ort merge strategy backend.
579
+ Doc fixes.
580
581
Will merge to 'master'.
477
- source: <pull.1518.v2.git.1682194930766.gitgitgadget@gmail.com>
478
-
479
-
480
-* ma/gittutorial-fixes (2023-04-20) 2 commits
481
- - gittutorial: wrap literal examples in backticks
482
- - gittutorial: drop early mention of origin
483
-
582
source: <cover.1681579244.git.martin.agren@gmail.com>
583
584
@@ -496,6 +594,8 @@ Release tarballs are available at:
594
595
"git send-email" learned to give the e-mail headers to the validate
596
hook by passing an extra argument from the command line.
597
+
598
+ Will merge to 'next'.
599
source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
600
601
@@ -512,7 +612,8 @@ Release tarballs are available at:
612
'git worktree add' learned how to create a worktree based on an
613
orphaned branch with `--orphan`.
614
515
- Comments?
615
+ Expecting a reroll.
616
+ cf. <m7crhly2j3k76whydbtdwhvzghvoql436g3lqtst4v3ahv75aa@wq5zjepgrxz5>
617
source: <20230417093255.31079-1-jacobabel@nullpo.dev>
618
619
@@ -524,7 +625,7 @@ Release tarballs are available at:
625
source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
626
627
527
-* kh/doc-interpret-trailers-updates (2023-04-12) 4 commits
628
+* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
629
- doc: interpret-trailers: fix example
630
- doc: interpret-trailers: don’t use deprecated config
631
- doc: interpret-trailers: use input redirection
@@ -532,9 +633,8 @@ Release tarballs are available at:
633
634
Doc update.
635
535
- Expecting a reroll.
536
- cf. <xmqqcz487qds.fsf@gitster.g>, <xmqqjzyg7qdw.fsf@gitster.g>
537
- source: <cover.1681326818.git.code@khaugsbakk.name>
636
+ Will merge to 'next'?
637
+ source: <cover.1682970213.git.code@khaugsbakk.name>
638
639
640
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
@@ -553,21 +653,6 @@ Release tarballs are available at:
653
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
654
655
556
-* tb/ban-strtok (2023-04-27) 6 commits
557
- (merged to 'next' on 2023-04-27 at cbbfa4a609)
558
- + banned.h: mark `strtok()` and `strtok_r()` as banned
559
- + t/helper/test-json-writer.c: avoid using `strtok()`
560
- + t/helper/test-oidmap.c: avoid using `strtok()`
561
- + t/helper/test-hashmap.c: avoid using `strtok()`
562
- + string-list: introduce `string_list_setlen()`
563
- + string-list: multi-delimiter `string_list_split_in_place()`
564
-
565
- Mark strtok() and strtok_r() to be banned.
566
-
567
- Will merge to 'master'.
568
- source: <cover.1682374789.git.me@ttaylorr.com>
569
-
570
-
656
* rn/sparse-diff-index (2023-04-10) 1 commit
657
- diff-index: enable sparse index
658
@@ -624,6 +709,7 @@ Release tarballs are available at:
709
wincred credential helper.
710
711
Will merge to 'next'?
712
+ cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
713
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
714
715
@@ -657,12 +743,14 @@ Release tarballs are available at:
743
source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
744
745
660
-* sl/diff-files-sparse (2023-04-24) 2 commits
746
+* sl/diff-files-sparse (2023-05-02) 2 commits
747
- diff-files: integrate with sparse index
748
- t1092: add tests for `git diff-files`
749
750
Teach "diff-files" not to expand sparse-index unless needed.
665
- source: <20230423010721.1402736-1-cheskaqiqi@gmail.com>
751
+
752
+ Will merge to 'next'?
753
+ source: <20230502172335.478312-1-cheskaqiqi@gmail.com>
754
755
756
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
@@ -681,16 +769,6 @@ Release tarballs are available at:
769
--------------------------------------------------
770
[Discarded]
771
684
-* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
685
- . rebase -i: do not update "done" when rescheduling command
686
-
687
- "rebase -i" moved a "rescheduled" insn in the todo file to the
688
- "done" list before it completed, which has been corrected.
689
-
690
- Replaced with a much more enhanced pw/rebase-i-after-failure topic.
691
- source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
692
-
693
-
772
* ed/fsmonitor-inotify (2022-12-13) 6 commits
773
. fsmonitor: update doc for Linux
774
. fsmonitor: test updates
@@ -706,17 +784,6 @@ Release tarballs are available at:
784
source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
785
786
709
-* rj/sendemail-validate-series-hook (2023-04-05) 1 commit
710
- . hooks: add sendemail-validate-series
711
-
712
- "git send-email" learns a new hook that takes the entire set of
713
- patch files from its standard input to validate them in one go,
714
- instead of getting called once per each file.
715
-
716
- Superseded by the rj/send-email-validate-hook-count-messages topic.
717
- source: <20230405231305.96996-1-robin@jarry.cc>
718
-
719
-
787
* my/wildmatch-cleanups (2023-02-27) 5 commits
788
. wildmatch: more cleanups after killing uchar
789
. wildmatch: use char instead of uchar