What's cooking (2023/01 #05)
Junio C Hamano committed
Jan 17, 2023 at 09:36 UTC
3e2f5b31435b5c048865353ba3893b5f6ae810ae
1 file changed
+342
-293
whats-cooking.txt
+342
-293
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2023, #04; Sat, 14)
3
-X-master-at: a38d39a4c50d1275833aba54c4dbdfce9e2e9ca1
4
-X-next-at: 8cbeef4abda4907dd68ea144d9dcb85f0b49c3e6
2
+Subject: What's cooking in git.git (Jan 2023, #05; Tue, 17)
3
+X-master-at: a7caae2729742fc80147bca1c02ae848cb55921a
4
+X-next-at: 3abcab475e35598790da85d8a607d719986a9436
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2023, #04; Sat, 14)
7
+What's cooking in git.git (Jan 2023, #05; Tue, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,6 +14,10 @@ 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
+A maintenance release Git 2.39.1 and friends to address two security
18
+issues are out, and today's 'master', 'next', and 'seen' all include
19
+the fix.
20
+
21
Copies of the source code to Git live in many repositories, and the
22
following is a list of the ones I push into or their mirrors. Some
23
repositories have only a subset of branches.
@@ -43,181 +47,144 @@ Release tarballs are available at:
47
https://www.kernel.org/pub/software/scm/git/
48
49
--------------------------------------------------
46
-[New Topics]
47
-
48
-* ab/cache-api-cleanup (2023-01-13) 5 commits
49
- - cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
50
- - read-cache.c: refactor set_new_index_sparsity() for subsequent commit
51
- - sparse-index API: BUG() out on NULL ensure_full_index()
52
- - sparse-index.c: expand_to_path() can assume non-NULL "istate"
53
- - builtin/difftool.c: { 0 }-initialize rather than using memset()
54
-
55
- Code clean-up to tighten the use of in-core index in the API.
56
-
57
- Will merge to 'next'.
58
- source: <cover-v2-0.6-00000000000-20230112T124842Z-avarab@gmail.com>
59
-
60
-
61
-* ab/test-env-helper (2023-01-13) 1 commit
62
- - env-helper: move this built-in to to "test-tool env-helper"
63
-
64
- Remove "git env--helper" and demote it to a test-tool subcommand.
65
-
66
- Will merge to 'next'.
67
- source: <patch-1.1-e662c570f1d-20230112T155226Z-avarab@gmail.com>
68
-
69
-
70
-* ar/bisect-doc-update (2023-01-13) 2 commits
71
- - git-bisect-lk2009: update nist report link
72
- - git-bisect-lk2009: update java code conventions link
73
-
74
- Doc update.
75
-
76
- Will merge to 'next'.
77
- source: <20230110093251.193552-1-rybak.a.v@gmail.com>
78
-
79
-
80
-* ar/test-cleanup (2023-01-13) 3 commits
81
- - t7527: use test_when_finished in 'case insensitive+preserving'
82
- - t6422: drop commented out code
83
- - t6003: uncomment test '--max-age=c3, --topo-order'
50
+[Graduated to 'master']
51
85
- Test clean-up.
86
-
87
- Will merge to 'next'.
88
- source: <20230111233242.16870-1-rybak.a.v@gmail.com>
89
-
90
-
91
-* en/ls-files-doc-update (2023-01-13) 4 commits
92
- - ls-files: guide folks to --exclude-standard over other --exclude* options
93
- - ls-files: clarify descriptions of status tags for -t
94
- - ls-files: clarify descriptions of file selection options
95
- - ls-files: add missing documentation for --resolve-undo option
96
-
97
- Doc update to ls-files.
98
-
99
- Needs review.
100
- source: <pull.1463.git.1673584914.gitgitgadget@gmail.com>
52
+* ds/omit-trailing-hash-in-index (2023-01-07) 4 commits
53
+ (merged to 'next' on 2023-01-09 at e17ef56485)
54
+ + features: feature.manyFiles implies fast index writes
55
+ + test-lib-functions: add helper for trailing hash
56
+ + read-cache: add index.skipHash config option
57
+ + hashfile: allow skipping the hash function
58
59
+ Introduce an optional configuration to allow the trailing hash that
60
+ protects the index file from bit flipping.
61
+ source: <pull.1439.v5.git.1673022717.gitgitgadget@gmail.com>
62
103
-* en/t6426-todo-cleanup (2023-01-13) 1 commit
104
- - t6426: fix TODO about making test more comprehensive
63
+* ar/dup-words-fixes (2023-01-08) 1 commit
64
+ (merged to 'next' on 2023-01-09 at 2a5d4537a2)
65
+ + *: fix typos which duplicate a word
66
106
- Test clean-up.
67
+ Typofixes.
68
+ source: <20230107135655.149892-1-rybak.a.v@gmail.com>
69
108
- Expecting a reroll.
109
- cf. <CABPp-BE8O0beOS3=Y5Sh23KMRJGsOqmdHWD=ide4_=Zn5bWSPg@mail.gmail.com>
110
- source: <pull.1462.git.1673584084761.gitgitgadget@gmail.com>
70
71
+* ds/bundle-uri-4 (2023-01-06) 1 commit
72
+ (merged to 'next' on 2023-01-08 at d5b03bdd48)
73
+ + test-bundle-uri: drop unused variables
74
+ (this branch is used by ds/bundle-uri-5.)
75
113
-* jc/doc-diff-patch.txt (2023-01-13) 1 commit
114
- - docs: link generating patch sections
76
+ Code clean-up.
77
+ source: <Y7fgV5eFx78BHdQ4@coredump.intra.peff.net>
78
116
- Doc update.
79
118
- Will merge to 'next'.
119
- source: <pull.1392.v2.git.git.1673626524221.gitgitgadget@gmail.com>
80
+* es/t1509-root-fixes (2022-12-09) 3 commits
81
+ (merged to 'next' on 2023-01-08 at c922e34bab)
82
+ + t1509: facilitate repeated script invocations
83
+ + t1509: make "setup" test more robust
84
+ + t1509: fix failing "root work tree" test due to owner-check
85
86
+ Test fixes.
87
+ source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>
88
122
-* jk/interop-error (2023-01-13) 1 commit
123
- - t/interop: report which vanilla git command failed
89
125
- Test helper improvement.
90
+* jk/ext-diff-with-relative (2023-01-06) 3 commits
91
+ (merged to 'next' on 2023-01-08 at 5233a7d3ee)
92
+ + diff: drop "name" parameter from prepare_temp_file()
93
+ + diff: clean up external-diff argv setup
94
+ + diff: use filespec path to set up tempfiles for ext-diff
95
127
- Will merge to 'next'.
128
- source: <Y8A3yGeJl0TCDNqe@coredump.intra.peff.net>
96
+ "git diff --relative" did not mix well with "git diff --ext-diff",
97
+ which has been corrected.
98
+ source: <Y7f/YiVu1TgbucDI@coredump.intra.peff.net>
99
100
131
-* pw/rebase-exec-cleanup (2023-01-13) 1 commit
132
- - rebase: cleanup "--exec" option handling
101
+* jk/strncmp-to-api-funcs (2023-01-08) 2 commits
102
+ (merged to 'next' on 2023-01-09 at 47395b7c6f)
103
+ + convert trivial uses of strncmp() to skip_prefix()
104
+ + convert trivial uses of strncmp() to starts_with()
105
106
Code clean-up.
107
+ source: <Y7lyga5g2leSmWQd@coredump.intra.peff.net>
108
136
- Will merge to 'next'.
137
- source: <pull.1461.git.1673542201452.gitgitgadget@gmail.com>
138
-
139
-
140
-* sk/merge-filtering-strategies-micro-optim (2023-01-13) 1 commit
141
- - merge: break out of all_strategy loop when strategy is found
142
-
143
- Micro optimization.
144
-
145
- Will merge to 'next'.
146
- source: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com>
109
110
+* pw/ci-print-failure-name-fix (2023-01-04) 1 commit
111
+ (merged to 'next' on 2023-01-08 at 8bb55c12c7)
112
+ + ci(github): restore "print test failures" step name
113
149
-* yo/doc-use-more-switch-c (2023-01-13) 1 commit
150
- - doc: add "git switch -c" as another option on detached HEAD
114
+ (cosmetic) CI regression fix.
115
+ source: <pull.1453.git.1672741640587.gitgitgadget@gmail.com>
116
152
- Doc update.
117
154
- Will merge to 'next'.
155
- source: <pull.1422.v2.git.git.1673261237449.gitgitgadget@gmail.com>
118
+* tb/ci-concurrency (2022-11-08) 1 commit
119
+ (merged to 'next' on 2023-01-08 at ab7cdc20b8)
120
+ + ci: avoid unnecessary builds
121
122
+ Avoid unnecessary builds in CI, with settings configured in
123
+ ci-config.
124
+ source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
125
158
-* zh/scalar-progress (2023-01-13) 2 commits
159
- - SQUASH???
160
- - scalar: show progress if stderr refers to a terminal
126
162
- "scalar" learned to give progress bar.
127
+* tr/am--no-verify (2023-01-05) 1 commit
128
+ (merged to 'next' on 2023-01-08 at 4585013067)
129
+ + am: allow passing --no-verify flag
130
164
- Will merge to 'next' after squashing the fixlet in?
165
- source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
131
+ Conditionally skip the pre-applypatch and applypatch-msg hooks when
132
+ applying patches with 'git am'.
133
+ source: <20221130172833.2662751-1-thierry.reding@gmail.com>
134
135
168
-* ab/bisect-cleanup (2023-01-13) 6 commits
169
- - bisect: no longer try to clean up left-over `.git/head-name` files
170
- - bisect: remove Cogito-related code
171
- - bisect run: fix the error message
172
- - bisect: verify that a bogus option won't try to start a bisection
173
- - bisect--helper: make the order consistently `argc, argv`
174
- - bisect--helper: simplify exit code computation
136
+* ws/single-file-cone (2023-01-05) 1 commit
137
+ (merged to 'next' on 2023-01-09 at b6d4d7b905)
138
+ + dir: check for single file cone patterns
139
176
- Code clean-up.
140
+ The logic to see if we are using the "cone" mode by checking the
141
+ sparsity patterns has been tightened to avoid mistaking a pattern
142
+ that names a single file as specifying a cone.
143
+ source: <pull.1446.v2.git.1672734059938.gitgitgadget@gmail.com>
144
178
- Will merge to 'next'.
179
- source: <cover-v2-0.6-00000000000-20230112T151651Z-avarab@gmail.com>
145
+--------------------------------------------------
146
+[New Topics]
147
148
+* rs/ls-tree-path-expansion-fix (2023-01-14) 2 commits
149
+ (merged to 'next' on 2023-01-16 at 6359f28ba7)
150
+ + ls-tree: remove dead store and strbuf for quote_c_style()
151
+ + ls-tree: fix expansion of repeated %(path)
152
182
-* ms/send-email-feed-header-to-validate-hook (2023-01-13) 2 commits
183
- - send-email: expose header information to git-send-email's sendemail-validate hook
184
- - send-email: refactor header generation functions
153
+ "git ls-tree --format='%(path) %(path)' $tree $path" showed the
154
+ path three times, which has been corrected.
155
186
- "git send-email" learned to give the e-mail headers to the validate
187
- hook by passing an extra argument from the command line.
188
- source: <20230110211452.2568535-1-michael.strawbridge@amd.com>
156
+ Will merge to 'master'.
157
+ source: <55ae7333-3a13-0575-93ed-f858a1c2877e@web.de>
158
159
191
-* tl/ls-tree-code-clean-up (2023-01-13) 6 commits
192
- - t3104: remove shift code in 'test_ls_tree_format'
193
- - ls-tree: cleanup the redundant SPACE
194
- - ls-tree: make "line_termination" less generic
195
- - ls-tree: fold "show_tree_data" into "cb" struct
196
- - ls-tree: use a "struct options"
197
- - ls-tree: don't use "show_tree_data" for "fast" callbacks
160
+* jc/format-patch-v-unleak (2023-01-16) 1 commit
161
+ (merged to 'next' on 2023-01-16 at 2155d512bc)
162
+ + format-patch: unleak "-v <num>"
163
199
- Code clean-up.
164
+ Plug a small leak.
165
201
- Will merge to 'next'.
202
- source: <20230112091135.20050-1-tenglong.tl@alibaba-inc.com>
166
+ Will merge to 'master'.
167
+ source: <xmqqv8l8gr6s.fsf@gitster.g>
168
169
205
-* yc/doc-fetch-fix (2023-01-13) 1 commit
206
- - doc: fix non-existent config name
170
+* jk/curl-avoid-deprecated-api (2023-01-17) 3 commits
171
+ - http: support CURLOPT_PROTOCOLS_STR
172
+ - http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
173
+ - http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
174
208
- Doc fix.
175
+ Deal with a few deprecation warning from cURL library.
176
177
Will merge to 'next'.
211
- source: <CAEg0tHSZi22RUBREJB=Cfy6O72cicv9FTkgo_Z=gvGRdPK1acw@mail.gmail.com>
178
+ source: <Y8YP+R/hyNr6sEFA@coredump.intra.peff.net>
179
180
214
-* jc/ci-deprecated-declarations-are-not-fatal (2023-01-13) 1 commit
215
- - ci: do not die on deprecated-declarations warning
181
+* ds/omit-trailing-hash-in-index (2023-01-17) 1 commit
182
+ - t1600: fix racy index.skipHash test
183
217
- CI build fix for overzealous -Werror.
184
+ Quickfix for a topic already in 'master'.
185
219
- Will merge to 'next'?
220
- source: <xmqqv8l9n5fj.fsf@gitster.g>
186
+ Will merge to 'next' and then to 'master'.
187
+ source: <76204710-356a-2a85-9057-302e6619b9df@github.com>
188
189
--------------------------------------------------
190
[Stalled]
@@ -360,14 +327,193 @@ Release tarballs are available at:
327
--------------------------------------------------
328
[Cooking]
329
363
-* ar/dup-words-fixes (2023-01-08) 1 commit
364
- (merged to 'next' on 2023-01-09 at 2a5d4537a2)
365
- + *: fix typos which duplicate a word
330
+* ab/cache-api-cleanup (2023-01-16) 5 commits
331
+ (merged to 'next' on 2023-01-16 at a0f388b149)
332
+ + cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
333
+ + read-cache.c: refactor set_new_index_sparsity() for subsequent commit
334
+ + sparse-index API: BUG() out on NULL ensure_full_index()
335
+ + sparse-index.c: expand_to_path() can assume non-NULL "istate"
336
+ + builtin/difftool.c: { 0 }-initialize rather than using memset()
337
367
- Typofixes.
338
+ Code clean-up to tighten the use of in-core index in the API.
339
340
Will merge to 'master'.
370
- source: <20230107135655.149892-1-rybak.a.v@gmail.com>
341
+ source: <cover-v2-0.6-00000000000-20230112T124842Z-avarab@gmail.com>
342
+
343
+
344
+* ab/test-env-helper (2023-01-14) 1 commit
345
+ (merged to 'next' on 2023-01-16 at 82c17f02e5)
346
+ + env-helper: move this built-in to "test-tool env-helper"
347
+
348
+ Remove "git env--helper" and demote it to a test-tool subcommand.
349
+
350
+ Will merge to 'master'.
351
+ source: <patch-1.1-e662c570f1d-20230112T155226Z-avarab@gmail.com>
352
+
353
+
354
+* ar/bisect-doc-update (2023-01-13) 2 commits
355
+ (merged to 'next' on 2023-01-14 at df5185519c)
356
+ + git-bisect-lk2009: update nist report link
357
+ + git-bisect-lk2009: update java code conventions link
358
+
359
+ Doc update.
360
+
361
+ Will merge to 'master'.
362
+ source: <20230110093251.193552-1-rybak.a.v@gmail.com>
363
+
364
+
365
+* ar/test-cleanup (2023-01-13) 3 commits
366
+ (merged to 'next' on 2023-01-14 at 16d372b65d)
367
+ + t7527: use test_when_finished in 'case insensitive+preserving'
368
+ + t6422: drop commented out code
369
+ + t6003: uncomment test '--max-age=c3, --topo-order'
370
+
371
+ Test clean-up.
372
+
373
+ Will merge to 'master'.
374
+ source: <20230111233242.16870-1-rybak.a.v@gmail.com>
375
+
376
+
377
+* en/ls-files-doc-update (2023-01-13) 4 commits
378
+ - ls-files: guide folks to --exclude-standard over other --exclude* options
379
+ - ls-files: clarify descriptions of status tags for -t
380
+ - ls-files: clarify descriptions of file selection options
381
+ - ls-files: add missing documentation for --resolve-undo option
382
+
383
+ Doc update to ls-files.
384
+
385
+ Needs review.
386
+ source: <pull.1463.git.1673584914.gitgitgadget@gmail.com>
387
+
388
+
389
+* en/t6426-todo-cleanup (2023-01-14) 1 commit
390
+ (merged to 'next' on 2023-01-16 at 7d13842eeb)
391
+ + t6426: fix TODO about making test more comprehensive
392
+
393
+ Test clean-up.
394
+
395
+ Will merge to 'master'.
396
+ source: <pull.1462.v2.git.1673722187025.gitgitgadget@gmail.com>
397
+
398
+
399
+* jc/doc-diff-patch.txt (2023-01-13) 1 commit
400
+ (merged to 'next' on 2023-01-14 at d25ec1f631)
401
+ + docs: link generating patch sections
402
+
403
+ Doc update.
404
+
405
+ Will merge to 'master'.
406
+ source: <pull.1392.v2.git.git.1673626524221.gitgitgadget@gmail.com>
407
+
408
+
409
+* jk/interop-error (2023-01-13) 1 commit
410
+ (merged to 'next' on 2023-01-14 at ddca7887a5)
411
+ + t/interop: report which vanilla git command failed
412
+
413
+ Test helper improvement.
414
+
415
+ Will merge to 'master'.
416
+ source: <Y8A3yGeJl0TCDNqe@coredump.intra.peff.net>
417
+
418
+
419
+* pw/rebase-exec-cleanup (2023-01-13) 1 commit
420
+ (merged to 'next' on 2023-01-14 at 553d0daa62)
421
+ + rebase: cleanup "--exec" option handling
422
+
423
+ Code clean-up.
424
+
425
+ Will merge to 'master'.
426
+ source: <pull.1461.git.1673542201452.gitgitgadget@gmail.com>
427
+
428
+
429
+* sk/merge-filtering-strategies-micro-optim (2023-01-13) 1 commit
430
+ (merged to 'next' on 2023-01-14 at f171559fae)
431
+ + merge: break out of all_strategy loop when strategy is found
432
+
433
+ Micro optimization.
434
+
435
+ Will merge to 'master'.
436
+ source: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com>
437
+
438
+
439
+* yo/doc-use-more-switch-c (2023-01-13) 1 commit
440
+ (merged to 'next' on 2023-01-14 at 7169d5dabc)
441
+ + doc: add "git switch -c" as another option on detached HEAD
442
+
443
+ Doc update.
444
+
445
+ Will merge to 'master'.
446
+ source: <pull.1422.v2.git.git.1673261237449.gitgitgadget@gmail.com>
447
+
448
+
449
+* zh/scalar-progress (2023-01-16) 1 commit
450
+ - scalar: show progress if stderr refers to a terminal
451
+
452
+ "scalar" learned to give progress bar.
453
+
454
+ Will merge to 'next'.
455
+ source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
456
+
457
+
458
+* ab/bisect-cleanup (2023-01-13) 6 commits
459
+ (merged to 'next' on 2023-01-14 at 945b631a1e)
460
+ + bisect: no longer try to clean up left-over `.git/head-name` files
461
+ + bisect: remove Cogito-related code
462
+ + bisect run: fix the error message
463
+ + bisect: verify that a bogus option won't try to start a bisection
464
+ + bisect--helper: make the order consistently `argc, argv`
465
+ + bisect--helper: simplify exit code computation
466
+
467
+ Code clean-up.
468
+
469
+ Will merge to 'master'.
470
+ source: <cover-v2-0.6-00000000000-20230112T151651Z-avarab@gmail.com>
471
+
472
+
473
+* ms/send-email-feed-header-to-validate-hook (2023-01-17) 2 commits
474
+ - send-email: expose header information to git-send-email's sendemail-validate hook
475
+ - send-email: refactor header generation functions
476
+
477
+ "git send-email" learned to give the e-mail headers to the validate
478
+ hook by passing an extra argument from the command line.
479
+
480
+ Under review.
481
+ source: <20230117142706.230404-1-michael.strawbridge@amd.com>
482
+
483
+
484
+* tl/ls-tree-code-clean-up (2023-01-13) 6 commits
485
+ (merged to 'next' on 2023-01-14 at f7238037fd)
486
+ + t3104: remove shift code in 'test_ls_tree_format'
487
+ + ls-tree: cleanup the redundant SPACE
488
+ + ls-tree: make "line_termination" less generic
489
+ + ls-tree: fold "show_tree_data" into "cb" struct
490
+ + ls-tree: use a "struct options"
491
+ + ls-tree: don't use "show_tree_data" for "fast" callbacks
492
+
493
+ Code clean-up.
494
+
495
+ Will merge to 'master'.
496
+ source: <20230112091135.20050-1-tenglong.tl@alibaba-inc.com>
497
+
498
+
499
+* yc/doc-fetch-fix (2023-01-13) 1 commit
500
+ (merged to 'next' on 2023-01-14 at a3ca60840b)
501
+ + doc: fix non-existent config name
502
+
503
+ Doc fix.
504
+
505
+ Will merge to 'master'.
506
+ source: <CAEg0tHSZi22RUBREJB=Cfy6O72cicv9FTkgo_Z=gvGRdPK1acw@mail.gmail.com>
507
+
508
+
509
+* jc/ci-deprecated-declarations-are-not-fatal (2023-01-14) 1 commit
510
+ (merged to 'next' on 2023-01-14 at 5efb778ab0)
511
+ + ci: do not die on deprecated-declarations warning
512
+
513
+ CI build fix for overzealous -Werror.
514
+
515
+ Will merge to 'master'.
516
+ source: <xmqq7cxpkpjp.fsf@gitster.g>
517
518
519
* ds/bundle-uri-5 (2023-01-07) 8 commits
@@ -379,7 +525,6 @@ Release tarballs are available at:
525
- bundle-uri: parse bundle.<id>.creationToken values
526
- bundle-uri: parse bundle.heuristic=creationToken
527
- t5558: add tests for creationToken heuristic
382
- (this branch uses ds/bundle-uri-4.)
528
529
The bundle-URI subsystem adds support for creation-token heuristics
530
to help incremental fetches.
@@ -404,40 +549,27 @@ Release tarballs are available at:
549
source: <Y7l4LsEQcDT9HZ21@coredump.intra.peff.net>
550
551
407
-* jk/strncmp-to-api-funcs (2023-01-08) 2 commits
408
- (merged to 'next' on 2023-01-09 at 47395b7c6f)
409
- + convert trivial uses of strncmp() to skip_prefix()
410
- + convert trivial uses of strncmp() to starts_with()
411
-
412
- Code clean-up.
413
-
414
- Will merge to 'master'.
415
- source: <Y7lyga5g2leSmWQd@coredump.intra.peff.net>
416
-
417
-
552
* pb/doc-orig-head (2023-01-13) 5 commits
419
- - git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
420
- - revisions.txt: be explicit about commands writing 'ORIG_HEAD'
421
- - git-merge.txt: mention 'ORIG_HEAD' in the Description
422
- - git-reset.txt: mention 'ORIG_HEAD' in the Description
423
- - git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
553
+ (merged to 'next' on 2023-01-14 at 0583c146cb)
554
+ + git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
555
+ + revisions.txt: be explicit about commands writing 'ORIG_HEAD'
556
+ + git-merge.txt: mention 'ORIG_HEAD' in the Description
557
+ + git-reset.txt: mention 'ORIG_HEAD' in the Description
558
+ + git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
559
560
Document ORIG_HEAD a bit more.
561
427
- Will merge to 'next'.
562
+ Will merge to 'master'.
563
source: <pull.1456.v2.git.1673356521.gitgitgadget@gmail.com>
564
565
431
-* tc/cat-file-z-use-cquote (2023-01-08) 1 commit
432
- . cat-file: quote-format name in error when using -z
566
+* tc/cat-file-z-use-cquote (2023-01-16) 1 commit
567
+ - cat-file: quote-format name in error when using -z
568
569
"cat-file" in the batch mode that is fed NUL-terminated pathnames
570
learned to cquote them in its error output (otherwise, a funny
571
pathname with LF in it would break the lines in the output stream).
437
-
438
- Breaks t1006.
439
- cf. https://github.com/git/git/actions/runs/3865911497/jobs/6589699288#step:6:1802
440
- source: <20230105062447.2943709-2-toon@iotcl.com>
572
+ source: <20230116190749.4141516-1-toon@iotcl.com>
573
574
575
* cb/grep-pcre-ucp (2023-01-09) 1 commit
@@ -446,142 +578,79 @@ Release tarballs are available at:
578
"grep -P" learned to use Unicode Character Property to grok
579
character classes when processing \b and \w etc.
580
449
- Will merge to 'next'?
581
+ Still skeptical.
582
+ cf. <230109.86v8lf297g.gmgdl@evledraar.gmail.com>
583
source: <20230108155217.2817-1-carenas@gmail.com>
584
585
586
* es/hooks-and-local-env (2023-01-13) 1 commit
454
- - githooks: discuss Git operations in foreign repositories
587
+ (merged to 'next' on 2023-01-14 at 93acd89393)
588
+ + githooks: discuss Git operations in foreign repositories
589
590
Doc update for environment variables set when hooks are invoked.
591
458
- Will merge to 'next'.
592
+ Will merge to 'master'.
593
source: <pull.1457.v2.git.1673293508399.gitgitgadget@gmail.com>
594
595
596
* ph/parse-date-reduced-precision (2023-01-13) 1 commit
463
- - date.c: allow ISO 8601 reduced precision times
597
+ (merged to 'next' on 2023-01-14 at eb83564c3e)
598
+ + date.c: allow ISO 8601 reduced precision times
599
600
Loosen date parsing heuristics.
601
467
- Will merge to 'next'.
468
- source: <20230111001003.10916-1-congdanhqx@gmail.com>
469
-
470
-
471
-* pw/ci-print-failure-name-fix (2023-01-04) 1 commit
472
- (merged to 'next' on 2023-01-08 at 8bb55c12c7)
473
- + ci(github): restore "print test failures" step name
474
-
475
- (cosmetic) CI regression fix.
476
-
602
Will merge to 'master'.
478
- source: <pull.1453.git.1672741640587.gitgitgadget@gmail.com>
603
+ source: <20230111001003.10916-1-congdanhqx@gmail.com>
604
605
606
* rs/use-enhanced-bre-on-macos (2023-01-08) 1 commit
482
- - use enhanced basic regular expressions on macOS
607
+ (merged to 'next' on 2023-01-16 at 9b80d4253f)
608
+ + use enhanced basic regular expressions on macOS
609
610
Newer regex library macOS stopped enabling GNU-like enhanced BRE,
611
where '\(A\|B\)' works as alternation, unless explicitly asked with
612
the REG_ENHANCED flag. "git grep" now can be compiled to do so, to
613
retain the old behaviour.
614
489
- Under discussion.
490
- cf. <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
615
+ Will merge to 'master'.
616
source: <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
617
618
619
* cw/submodule-status-in-parallel (2023-01-05) 6 commits
495
- - submodule: call parallel code from serial status
496
- - diff-lib: parallelize run_diff_files for submodules
497
- - diff-lib: refactor match_stat_with_submodule
498
- - submodule: move status parsing into function
499
- - submodule: strbuf variable rename
500
- - run-command: add duplicate_output_fn to run_processes_parallel_opts
620
+ . submodule: call parallel code from serial status
621
+ . diff-lib: parallelize run_diff_files for submodules
622
+ . diff-lib: refactor match_stat_with_submodule
623
+ . submodule: move status parsing into function
624
+ . submodule: strbuf variable rename
625
+ . run-command: add duplicate_output_fn to run_processes_parallel_opts
626
627
"git submodule status" learned to run the comparison in submodule
628
repositories in parallel.
629
630
Needs review.
631
+ Breaks "linux-leaks" CI job.
632
+ cf. <xmqqv8l8f8j8.fsf@gitster.g>
633
source: <https://lore.kernel.org/git/20221108184200.2813458-1-calvinwan@google.com/>
634
635
509
-* kn/attr-from-tree (2023-01-13) 2 commits
510
- - attr: add flag `--source` to work with tree-ish
511
- - t0003: move setup for `--all` into new block
636
+* kn/attr-from-tree (2023-01-14) 2 commits
637
+ (merged to 'next' on 2023-01-16 at 426f357683)
638
+ + attr: add flag `--source` to work with tree-ish
639
+ + t0003: move setup for `--all` into new block
640
641
"git check-attr" learned to take an optional tree-ish to read the
642
.gitattributes file from.
643
516
- Will merge to 'next'.
517
- source: <cover.1673521102.git.karthik.188@gmail.com>
518
-
519
-
520
-* ws/single-file-cone (2023-01-05) 1 commit
521
- (merged to 'next' on 2023-01-09 at b6d4d7b905)
522
- + dir: check for single file cone patterns
523
-
524
- The logic to see if we are using the "cone" mode by checking the
525
- sparsity patterns has been tightened to avoid mistaking a pattern
526
- that names a single file as specifying a cone.
527
-
528
- Will merge to 'master'.
529
- source: <pull.1446.v2.git.1672734059938.gitgitgadget@gmail.com>
530
-
531
-
532
-* ds/bundle-uri-4 (2023-01-06) 1 commit
533
- (merged to 'next' on 2023-01-08 at d5b03bdd48)
534
- + test-bundle-uri: drop unused variables
535
- (this branch is used by ds/bundle-uri-5.)
536
-
537
- Code clean-up.
538
-
539
- Will merge to 'master'.
540
- source: <Y7fgV5eFx78BHdQ4@coredump.intra.peff.net>
541
-
542
-
543
-* jk/ext-diff-with-relative (2023-01-06) 3 commits
544
- (merged to 'next' on 2023-01-08 at 5233a7d3ee)
545
- + diff: drop "name" parameter from prepare_temp_file()
546
- + diff: clean up external-diff argv setup
547
- + diff: use filespec path to set up tempfiles for ext-diff
548
-
549
- "git diff --relative" did not mix well with "git diff --ext-diff",
550
- which has been corrected.
551
-
644
Will merge to 'master'.
553
- source: <Y7f/YiVu1TgbucDI@coredump.intra.peff.net>
554
-
645
+ source: <cover.1673684790.git.karthik.188@gmail.com>
646
556
-* tb/ci-concurrency (2022-11-08) 1 commit
557
- (merged to 'next' on 2023-01-08 at ab7cdc20b8)
558
- + ci: avoid unnecessary builds
559
-
560
- Avoid unnecessary builds in CI, with settings configured in
561
- ci-config.
647
563
- Will merge to 'master'.
564
- source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
565
-
566
-
567
-* tr/am--no-verify (2023-01-05) 1 commit
568
- (merged to 'next' on 2023-01-08 at 4585013067)
569
- + am: allow passing --no-verify flag
570
-
571
- Conditionally skip the pre-applypatch and applypatch-msg hooks when
572
- applying patches with 'git am'.
573
-
574
- Will merge to 'master'.
575
- source: <20221130172833.2662751-1-thierry.reding@gmail.com>
576
-
577
-
578
-* ab/various-leak-fixes (2022-12-30) 20 commits
648
+* ab/various-leak-fixes (2023-01-14) 19 commits
649
- push: free_refs() the "local_refs" in set_refspecs()
650
- receive-pack: free() the "ref_name" in "struct command"
651
- grep API: plug memory leaks by freeing "header_list"
652
- grep.c: refactor free_grep_patterns()
653
- object-file.c: release the "tag" in check_tag()
584
- - connected.c: free(new_pack) in check_connected()
654
- builtin/merge.c: free "&buf" on "Your local changes..." error
655
- builtin/merge.c: always free "struct strbuf msg"
656
- show-branch: free() allocated "head" before return
@@ -593,14 +662,14 @@ Release tarballs are available at:
662
- name-rev: don't xstrdup() an already dup'd string
663
- various: add missing clear_pathspec(), fix leaks
664
- clone: use free() instead of UNLEAK()
596
- - commit-graph: use free() instead of UNLEAK()
665
+ - commit-graph: use free_commit_graph() instead of UNLEAK()
666
- bundle.c: don't leak the "args" in the "struct child_process"
667
- tests: mark tests as passing with SANITIZE=leak
668
669
Leak fixes.
670
602
- Expecting a reroll.
603
- source: <cover-v2-00.20-00000000000-20221230T020341Z-avarab@gmail.com>
671
+ Will merge to 'next'?
672
+ source: <cover-v3-00.19-00000000000-20230110T054138Z-avarab@gmail.com>
673
674
675
* rj/branch-unborn-in-other-worktrees (2023-01-01) 2 commits
@@ -613,15 +682,16 @@ Release tarballs are available at:
682
683
684
* rs/dup-array (2023-01-09) 5 commits
616
- - use DUP_ARRAY
617
- - add DUP_ARRAY
618
- - do full type check in BARF_UNLESS_COPYABLE
619
- - factor out BARF_UNLESS_COPYABLE
620
- - mingw: make argv2 in try_shell_exec() non-const
685
+ (merged to 'next' on 2023-01-14 at 3efbd1ffe0)
686
+ + use DUP_ARRAY
687
+ + add DUP_ARRAY
688
+ + do full type check in BARF_UNLESS_COPYABLE
689
+ + factor out BARF_UNLESS_COPYABLE
690
+ + mingw: make argv2 in try_shell_exec() non-const
691
692
Code cleaning.
693
624
- Will merge to 'next'.
694
+ Will merge to 'master'.
695
source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
696
source: <3e04e283-cad0-7be4-d85c-65d0a52289e2@web.de>
697
@@ -643,50 +713,26 @@ Release tarballs are available at:
713
714
715
* sk/win32-close-handle-upon-pthread-join (2023-01-04) 2 commits
646
- - win32: close handles of threads that have been joined
647
- - win32: prepare pthread.c for change by formatting
716
+ (merged to 'next' on 2023-01-16 at faa279fd5b)
717
+ + win32: close handles of threads that have been joined
718
+ + win32: prepare pthread.c for change by formatting
719
720
Pthread emulation on Win32 leaked thread handle when a thread is
721
joined.
722
652
- Will merge to 'next'?
653
- <source: <pull.1406.v13.git.git.1672762819.gitgitgadget@gmail.com>
654
-
655
-
656
-* ds/omit-trailing-hash-in-index (2023-01-07) 4 commits
657
- (merged to 'next' on 2023-01-09 at e17ef56485)
658
- + features: feature.manyFiles implies fast index writes
659
- + test-lib-functions: add helper for trailing hash
660
- + read-cache: add index.skipHash config option
661
- + hashfile: allow skipping the hash function
662
-
663
- Introduce an optional configuration to allow the trailing hash that
664
- protects the index file from bit flipping.
665
-
723
Will merge to 'master'.
667
- source: <pull.1439.v5.git.1673022717.gitgitgadget@gmail.com>
668
-
669
-
670
-* es/t1509-root-fixes (2022-12-09) 3 commits
671
- (merged to 'next' on 2023-01-08 at c922e34bab)
672
- + t1509: facilitate repeated script invocations
673
- + t1509: make "setup" test more robust
674
- + t1509: fix failing "root work tree" test due to owner-check
675
-
676
- Test fixes.
677
-
678
- Will merge to 'master'.
679
- source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>
724
+ source: <pull.1406.v13.git.git.1672762819.gitgitgadget@gmail.com>
725
726
727
* jx/t1301-updates (2022-11-30) 3 commits
683
- - t1301: do not change $CWD in "shared=all" test case
684
- - t1301: use test_when_finished for cleanup
685
- - t1301: fix wrong template dir for git-init
728
+ (merged to 'next' on 2023-01-14 at d4f081b3f8)
729
+ + t1301: do not change $CWD in "shared=all" test case
730
+ + t1301: use test_when_finished for cleanup
731
+ + t1301: fix wrong template dir for git-init
732
733
Test updates.
734
689
- Will merge to 'next'.
735
+ Will merge to 'master'.
736
source: <20221128130323.8914-1-worldhello.net@gmail.com>
737
738
@@ -696,6 +742,8 @@ Release tarballs are available at:
742
"git send-email -v 3" used to be expanded to "git send-email
743
--validate 3" when the user meant to pass them down to
744
"format-patch", which has been corrected.
745
+
746
+ Will merge to 'next'?
747
source: <87edtp5uws.fsf@kyleam.com>
748
749
@@ -708,7 +756,8 @@ Release tarballs are available at:
756
'git worktree add' learned how to create a worktree based on an
757
orphaned branch with `--orphan`.
758
711
- Will merge to 'next'.
759
+ Expecting a reroll.
760
+ cf. <11be1b0e-ee38-119f-1d80-cb818946116b@dunelm.org.uk>
761
source: <20230109173227.29264-1-jacobabel@nullpo.dev>
762
763