What's cooking (2023/05 #03)
Junio C Hamano committed
May 9, 2023 at 16:59 UTC
66304ed9aa3f888bdebf7866501cfa3ef17fb252
1 file changed
+392
-246
whats-cooking.txt
+392
-246
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2023, #02; Fri, 5)
3
-X-master-at: 69c786637d7a7fe3b2b8f7d989af095f5f49c3a8
4
-X-next-at: a4b1b128d6e6f4cf1ab6838085988181581b2791
2
+Subject: What's cooking in git.git (May 2023, #03; Tue, 9)
3
+X-master-at: 5597cfdf47db94825213fefe78c4485e6a5702d8
4
+X-next-at: 74a8c732097c5a952ed7b01bc0ef452daf5b8643
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2023, #02; Fri, 5)
7
+What's cooking in git.git (May 2023, #03; Tue, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,6 +16,11 @@ message that raises issues but they are no means exhaustive. A
16
topic without enough support may be discarded after a long period of
17
no activity.
18
19
+We are getting closer to pre-release freeze. As I prefer to have
20
+any non-trivial topics cook for 7 calendar days in 'next', anything
21
+not in 'next' by Friday this week are unlikely to be in -rc1 for the
22
+next release.
23
+
24
Copies of the source code to Git live in many repositories, and the
25
following is a list of the ones I push into or their mirrors. Some
26
repositories have only a subset of branches.
@@ -45,118 +50,241 @@ Release tarballs are available at:
50
https://www.kernel.org/pub/software/scm/git/
51
52
--------------------------------------------------
48
-[New Topics]
53
+[Graduated to 'master']
54
50
-* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit
51
- (merged to 'next' on 2023-05-04 at c2fd654367)
52
- + doc: remove custom callouts format
55
+* en/header-split-cache-h-part-2 (2023-04-24) 22 commits
56
+ (merged to 'next' on 2023-05-01 at 722c412915)
57
+ + reftable: ensure git-compat-util.h is the first (indirect) include
58
+ + diff.h: reduce unnecessary includes
59
+ + object-store.h: reduce unnecessary includes
60
+ + commit.h: reduce unnecessary includes
61
+ + fsmonitor: reduce includes of cache.h
62
+ + cache.h: remove unnecessary headers
63
+ + treewide: remove cache.h inclusion due to previous changes
64
+ + cache,tree: move basic name compare functions from read-cache to tree
65
+ + cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
66
+ + hash-ll.h: split out of hash.h to remove dependency on repository.h
67
+ + tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
68
+ + dir.h: move DTYPE defines from cache.h
69
+ + versioncmp.h: move declarations for versioncmp.c functions from cache.h
70
+ + ws.h: move declarations for ws.c functions from cache.h
71
+ + match-trees.h: move declarations for match-trees.c functions from cache.h
72
+ + pkt-line.h: move declarations for pkt-line.c functions from cache.h
73
+ + base85.h: move declarations for base85.c functions from cache.h
74
+ + copy.h: move declarations for copy.c functions from cache.h
75
+ + server-info.h: move declarations for server-info.c functions from cache.h
76
+ + packfile.h: move pack_window and pack_entry from cache.h
77
+ + symlinks.h: move declarations for symlinks.c functions from cache.h
78
+ + treewide: be explicit about dependence on strbuf.h
79
+ (this branch is used by en/header-split-cache-h-part-3.)
80
54
- Our custom callout formatter is no longer used in the documentation
55
- formatting toolchain, as the upstream default ones give better
56
- output these days.
81
+ More header clean-up.
82
+ source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
83
58
- Will merge to 'master'.
59
- source: <20230418011828.47851-1-felipe.contreras@gmail.com>
84
85
+* jk/parse-commit-with-malformed-ident (2023-04-27) 4 commits
86
+ (merged to 'next' on 2023-04-28 at cb6ea0412a)
87
+ + parse_commit(): describe more date-parsing failure modes
88
+ + parse_commit(): handle broken whitespace-only timestamp
89
+ + parse_commit(): parse timestamp from end of line
90
+ + t4212: avoid putting git on left-hand side of pipe
91
62
-* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit
63
- (merged to 'next' on 2023-05-04 at d048eb1ef8)
64
- + doc: manpage: remove maximum title length
92
+ The commit object parser has been taught to be a bit more lenient
93
+ to parse timestamps on the author/committer line with a malformed
94
+ author/committer ident.
95
+ source: <20230427081330.GA1461786@coredump.intra.peff.net>
96
66
- The titles of manual pages (formatted with AsciiDoc) used to be
67
- chomped at unreasonably short limit, which has been removed; this
68
- makes the formatted output match that of asciidoctor.
97
70
- Will merge to 'master'.
71
- source: <20230503171658.8996-1-felipe.contreras@gmail.com>
98
+* jw/send-email-update-gmail-insn (2023-04-28) 1 commit
99
+ (merged to 'next' on 2023-05-01 at cb5d83ee92)
100
+ + send-email docs: Remove mention of discontinued gmail feature
101
102
+ Doc update to drop use of deprecated app-specific password against
103
+ gmail.
104
+ source: <20221001104609.18453-1-j.witteveen@gmail.com>
105
74
-* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit
75
- (merged to 'next' on 2023-05-04 at a4b1b128d6)
76
- + docs: clarify git rm --cached function in gitignore note
106
78
- Doc update.
107
+* mh/fix-detect-compilers-with-nondigit-versions (2023-04-26) 1 commit
108
+ (merged to 'next' on 2023-04-28 at c0c54291c2)
109
+ + Handle some compiler versions containing a dash
110
80
- Will merge to 'master'.
81
- source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
111
+ The detect-compilers script to help auto-tweaking the build system
112
+ had trouble working with compilers whose version number has extra
113
+ suffixes. The script has been taught that certain suffixes (like
114
+ "-win32" in "gcc 10-win32") can be safely stripped as they share
115
+ the same features and bugs with the version without the suffix.
116
+ source: <20230426004843.3391826-1-mh@glandium.org>
117
118
84
-* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
85
- - builtin/pack-objects.c: introduce `pack.extraCruftTips`
119
+* ob/messages-capitalize-exception (2023-04-28) 1 commit
120
+ (merged to 'next' on 2023-05-01 at db0ef42b3a)
121
+ + messages: capitalization and punctuation exceptions
122
+ (this branch uses ob/sequencer-i18n-fix.)
123
87
- "git pack-objects" learned to invoke a new hook program that
88
- enumerates extra objects to be used as anchoring points to keep
89
- otherwise unreachable objects in cruft packs.
124
+ Message update.
125
+ source: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de>
126
91
- Under discussion
92
- cf. <20230505221921.GE3321533@coredump.intra.peff.net>
93
- source: <27a7f16aab35b5cac391d9831aadb0f2e2146313.1683151485.git.me@ttaylorr.com>
127
128
+* ob/sequencer-i18n-fix (2023-04-28) 1 commit
129
+ (merged to 'next' on 2023-05-01 at 242ca8ce15)
130
+ + sequencer: actually translate report in do_exec()
131
+ (this branch is used by ob/messages-capitalize-exception.)
132
96
-* jc/diff-s-with-other-options (2023-05-05) 1 commit
97
- - diff: fix interaction between the "-s" option and other options
98
- (this branch uses jc/dirstat-plug-leaks.)
133
+ Message update.
134
+ source: <20230428125649.1719796-2-oswald.buddenhagen@gmx.de>
135
100
- The "-s" (silent, squelch) option of the "diff" family of commands
101
- did not interact with other options that specify the output format
102
- well. This has been cleaned up so that it will clear all the
103
- formatting options given before.
136
105
- Will merge to 'next'?
106
- source: <20230505165952.335256-1-gitster@pobox.com>
137
+* ob/t3501-retitle (2023-05-01) 1 commit
138
+ (merged to 'next' on 2023-05-01 at 52730fcaaa)
139
+ + t/t3501-revert-cherry-pick.sh: clarify scope of the file
140
108
-* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
109
- - doc: manpage: remove ancient workaround
110
- - doc: git-svn: use listing instead of verse
141
+ Retitle a test script with an overly narrow name.
142
+ source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de>
143
112
- Documentation toolchain lost an ancient workaround that is no
113
- longer needed.
144
+--------------------------------------------------
145
+[New Topics]
146
115
- Needs review.
116
- source: <20230504035517.329765-1-felipe.contreras@gmail.com>
147
+* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
148
+ (merged to 'next' on 2023-05-09 at f4d7a7d671)
149
+ + t9800: correct misuse of 'show -s --raw' in a test
150
151
+ A test fix.
152
119
-* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
120
- - doc: revisions: add a bunch of missing quotes
121
- - doc: revisions: fix missing escape
153
+ Will merge to 'master'.
154
+ source: <xmqqild5rvvw.fsf@gitster.g>
155
123
- Doc cleanup.
156
+
157
+* tl/push-branches-is-an-alias-for-all (2023-05-06) 1 commit
158
+ (merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
159
+ + push: introduce '--branches' option
160
+
161
+ "git push --all" gained an alias "git push --branches".
162
+
163
+ Will merge to 'master'.
164
+ source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
165
+
166
+
167
+* en/header-split-cache-h-part-3 (2023-05-08) 25 commits
168
+ - fsmonitor-ll.h: split this header out of fsmonitor.h
169
+ - hash-ll, hashmap: move oidhash() to hash-ll
170
+ - git-compat-util.h: remove unneccessary include of wildmatch.h
171
+ - builtin.h: remove unneccessary includes
172
+ - list-objects-filter-options.h: remove unneccessary include
173
+ - diff.h: remove unnecessary include of oidset.h
174
+ - repository: remove unnecessary include of path.h
175
+ - log-tree: replace include of revision.h with simple forward declaration
176
+ - cache.h: remove this no-longer-used header
177
+ - read-cache*.h: move declarations for read-cache.c functions from cache.h
178
+ - repository.h: move declaration of the_index from cache.h
179
+ - merge.h: move declarations for merge.c from cache.h
180
+ - diff.h: move declaration for global in diff.c from cache.h
181
+ - preload-index.h: move declarations for preload-index.c from elsewhere
182
+ - sparse-index.h: move declarations for sparse-index.c from cache.h
183
+ - name-hash.h: move declarations for name-hash.c from cache.h
184
+ - run-command.h: move declarations for run-command.c from cache.h
185
+ - statinfo: move stat_{data,validity} functions from cache/read-cache
186
+ - read-cache: move shared add/checkout/commit code
187
+ - add: modify add_files_to_cache() to avoid globals
188
+ - read-cache: move shared commit and ls-files code
189
+ - setup: adopt shared init-db & clone code
190
+ - init-db, clone: change unnecessary global into passed parameter
191
+ - init-db: remove unnecessary global variable & document existing bug
192
+ - Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
193
+
194
+ source: <pull.1525.git.1683431149.gitgitgadget@gmail.com>
195
+
196
+
197
+* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
198
+ - subtree: support long global flags
199
+
200
+ "git subtree" (in contrib/) update.
201
+
202
+ Will merge to 'next'.
203
+ source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
204
+
205
+
206
+* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
207
+ (merged to 'next' on 2023-05-08 at adb334deec)
208
+ + Merge gitk changes into js/gitk-fixes-from-gfw
209
+ + gitk: escape file paths before piping to git log
210
+ + gitk: prevent overly long command lines
211
+
212
+ Gitk updates from GfW project.
213
+
214
+ Will merge to 'master'.
215
+ source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
216
+
217
+
218
+* la/doc-interpret-trailers (2023-05-08) 11 commits
219
+ - doc: trailer: add more examples in DESCRIPTION
220
+ - doc: trailer: mention 'key' in DESCRIPTION
221
+ - doc: trailer.<token>.command: emphasize deprecation
222
+ - doc: trailer.<token>.command: refer to existing example
223
+ - doc: trailer: trailer.<token>.cmd: add missing verb phrase
224
+ - doc: trailer: use angle brackets for <token> and <value>
225
+ - doc: trailer: explain "commit mesage part" on first usage
226
+ - doc: trailer: remove redundant phrasing
227
+ - doc: trailer: --no-divider: more precise language
228
+ - doc: trailer: swap verb order
229
+ - doc: trailer: fix grammar
230
+
231
+ Doc update.
232
233
Needs review.
126
- source: <20230504163421.100400-1-felipe.contreras@gmail.com>
234
+ source: <pull.1506.git.git.1683566870.gitgitgadget@gmail.com>
235
236
129
-* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
130
- - doc-diff: drop SOURCE_DATE_EPOCH override
131
- - doc: doc-diff: specify date
237
+* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
238
+ (merged to 'next' on 2023-05-09 at 7734f3d690)
239
+ + test: rev-parse-upstream: add missing cmp
240
133
- An earlier change broke "doc-diff", which has been corrected.
241
+ Test fix.
242
135
- Will merge to 'next'.
136
- source: <20230503232349.59997-1-felipe.contreras@gmail.com>
137
- source: <20230505211610.GA3197168@coredump.intra.peff.net>
243
+ Will merge to 'master'.
244
+ source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
245
246
140
-* jc/dirstat-plug-leaks (2023-05-05) 2 commits
141
- - diff: plug leaks in dirstat
142
- - diff: refactor common tail part of dirstat computation
143
- (this branch is used by jc/diff-s-with-other-options.)
247
+* cc/git-replay (2023-05-09) 16 commits
248
+ - SQUASH???
249
+ - replay: stop assuming replayed branches do not diverge
250
+ - replay: add --contained to rebase contained branches
251
+ - replay: add --advance or 'cherry-pick' mode
252
+ - replay: disallow revision specific options and pathspecs
253
+ - replay: use standard revision ranges
254
+ - replay: make it a minimal server side command
255
+ - replay: remove HEAD related sanity check
256
+ - replay: remove progress and info output
257
+ - replay: add an important FIXME comment about gpg signing
258
+ - replay: don't simplify history
259
+ - replay: introduce pick_regular_commit()
260
+ - replay: die() instead of failing assert()
261
+ - replay: start using parse_options API
262
+ - replay: introduce new builtin
263
+ - t6429: remove switching aspects of fast-rebase
264
145
- "git diff --dirstat" leaked memory, which has been plugged.
265
+ source: <20230509175347.1714141-1-christian.couder@gmail.com>
266
147
- Will merge to 'next'?
148
- source: <20230505211917.2746751-1-gitster@pobox.com>
267
268
+* jc/pack-ref-exclude-include (2023-05-09) 3 commits
269
+ - pack-refs: teach pack-refs --include option
270
+ - pack-refs: teach --exclude option to exclude refs from being packed
271
+ - docs: clarify git-pack-refs --all will pack all refs
272
151
-* jc/name-rev-deprecate-stdin-further (2023-05-05) 1 commit
152
- - name-rev: make --stdin hidden
273
+ "git pack-refs" learns "--include" and "--exclude" to tweak the ref
274
+ hierarchy to be packed using pattern matching.
275
+ source: <pull.1501.v2.git.git.1683659931.gitgitgadget@gmail.com>
276
154
- The "--stdin" option of "git name-rev" has been replaced with
155
- the "--annotate-stdin" option more than a year ago. We stop
156
- advertising it in the "git name-rev -h" output.
277
158
- Expecting a reroll.
159
- source: <pull.1225.v2.git.git.1683314270964.gitgitgadget@gmail.com>
278
+* jk/test-verbose-no-more (2023-05-08) 3 commits
279
+ (merged to 'next' on 2023-05-09 at 897bfd0a6b)
280
+ + t: drop "verbose" helper function
281
+ + t7001: use "ls-files --format" instead of "cut"
282
+ + t7001: avoid git on upstream of pipe
283
+
284
+ Retire "verbose" helper function from the test framework.
285
+
286
+ Will merge to 'master'.
287
+ source: <20230508185953.GA2108869@coredump.intra.peff.net>
288
289
--------------------------------------------------
290
[Stalled]
@@ -346,10 +474,126 @@ Release tarballs are available at:
474
--------------------------------------------------
475
[Cooking]
476
477
+* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit
478
+ (merged to 'next' on 2023-05-04 at c2fd654367)
479
+ + doc: remove custom callouts format
480
+
481
+ Our custom callout formatter is no longer used in the documentation
482
+ formatting toolchain, as the upstream default ones give better
483
+ output these days.
484
+
485
+ Will merge to 'master'.
486
+ source: <20230418011828.47851-1-felipe.contreras@gmail.com>
487
+
488
+
489
+* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit
490
+ (merged to 'next' on 2023-05-04 at d048eb1ef8)
491
+ + doc: manpage: remove maximum title length
492
+
493
+ The titles of manual pages (formatted with AsciiDoc) used to be
494
+ chomped at unreasonably short limit, which has been removed; this
495
+ makes the formatted output match that of asciidoctor.
496
+
497
+ Will merge to 'master'.
498
+ source: <20230503171658.8996-1-felipe.contreras@gmail.com>
499
+
500
+
501
+* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit
502
+ (merged to 'next' on 2023-05-04 at a4b1b128d6)
503
+ + docs: clarify git rm --cached function in gitignore note
504
+
505
+ Doc update.
506
+
507
+ Will merge to 'master'.
508
+ source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
509
+
510
+
511
+* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
512
+ - builtin/pack-objects.c: introduce `pack.extraCruftTips`
513
+
514
+ "git pack-objects" learned to invoke a new hook program that
515
+ enumerates extra objects to be used as anchoring points to keep
516
+ otherwise unreachable objects in cruft packs.
517
+
518
+ Under discussion
519
+ cf. <20230505221921.GE3321533@coredump.intra.peff.net>
520
+ source: <27a7f16aab35b5cac391d9831aadb0f2e2146313.1683151485.git.me@ttaylorr.com>
521
+
522
+
523
+* jc/diff-s-with-other-options (2023-05-05) 1 commit
524
+ - diff: fix interaction between the "-s" option and other options
525
+ (this branch uses jc/dirstat-plug-leaks.)
526
+
527
+ The "-s" (silent, squelch) option of the "diff" family of commands
528
+ did not interact with other options that specify the output format
529
+ well. This has been cleaned up so that it will clear all the
530
+ formatting options given before.
531
+
532
+ Will merge to 'next'?
533
+ source: <20230505165952.335256-1-gitster@pobox.com>
534
+
535
+
536
+* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
537
+ - doc: manpage: remove ancient workaround
538
+ - doc: git-svn: use listing instead of verse
539
+
540
+ Documentation toolchain lost an ancient workaround that is no
541
+ longer needed.
542
+
543
+ Needs review.
544
+ source: <20230504035517.329765-1-felipe.contreras@gmail.com>
545
+
546
+
547
+* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
548
+ - doc: revisions: add a bunch of missing quotes
549
+ - doc: revisions: fix missing escape
550
+
551
+ Doc cleanup.
552
+
553
+ Needs review.
554
+ source: <20230504163421.100400-1-felipe.contreras@gmail.com>
555
+
556
+
557
+* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
558
+ (merged to 'next' on 2023-05-06 at 1eda43b03f)
559
+ + doc-diff: drop SOURCE_DATE_EPOCH override
560
+ + doc: doc-diff: specify date
561
+
562
+ An earlier change broke "doc-diff", which has been corrected.
563
+
564
+ Will merge to 'master'.
565
+ source: <20230503232349.59997-1-felipe.contreras@gmail.com>
566
+ source: <20230505211610.GA3197168@coredump.intra.peff.net>
567
+
568
+
569
+* jc/dirstat-plug-leaks (2023-05-05) 2 commits
570
+ (merged to 'next' on 2023-05-09 at 2df7cf06e4)
571
+ + diff: plug leaks in dirstat
572
+ + diff: refactor common tail part of dirstat computation
573
+ (this branch is used by jc/diff-s-with-other-options.)
574
+
575
+ "git diff --dirstat" leaked memory, which has been plugged.
576
+
577
+ Will merge to 'master'.
578
+ source: <20230505211917.2746751-1-gitster@pobox.com>
579
+
580
+
581
+* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
582
+ (merged to 'next' on 2023-05-09 at 0db4f08e32)
583
+ + name-rev: make --stdin hidden
584
+
585
+ The "--stdin" option of "git name-rev" has been replaced with
586
+ the "--annotate-stdin" option more than a year ago. We stop
587
+ advertising it in the "git name-rev -h" output.
588
+
589
+ Will merge to 'master'.
590
+ source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
591
+
592
+
593
* ob/revert-of-revert (2023-05-05) 1 commit
594
- sequencer: beautify subject of reverts of reverts
595
352
- Instead of "Revert "Revert "original"", give "Replay "original""
596
+ Instead of "Revert "Revert "original"", give "Reapply "original""
597
as the title for a revert of a revert.
598
599
Expecting a hopefully final reroll.
@@ -358,48 +602,39 @@ Release tarballs are available at:
602
603
604
* mh/use-wincred-from-system (2023-03-27) 1 commit
361
- - credential/wincred: include wincred.h
605
+ (merged to 'next' on 2023-05-06 at a545c5d4aa)
606
+ + credential/wincred: include wincred.h
607
608
Code clean-up.
609
365
- Will merge to 'next'.
610
+ Will merge to 'master'.
611
cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
612
cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
613
source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
614
615
371
-* jc/attr-source-tree (2023-05-03) 1 commit
616
+* jc/attr-source-tree (2023-05-06) 1 commit
617
- attr: teach "--attr-source=<tree>" global option to "git"
618
619
"git --attr-source=<tree> cmd $args" is a new way to have any
620
command to read attributes not from the working tree but from the
621
given tree object.
622
378
- Expecting a hopefully final minor reroll.
379
- cf. <CAP8UFD1AuFWWC=iAe0duhpSsw9HnA-tcpV2F3NGT+089aY60Ow@mail.gmail.com>
380
- source: <pull.1470.v5.git.git.1683144574158.gitgitgadget@gmail.com>
623
+ Will merge to 'next'.
624
+ source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
625
626
627
* mc/send-email-header-cmd (2023-05-01) 3 commits
384
- - send-email: detect empty blank lines in command output
385
- - send-email: add --header-cmd, --no-header-cmd options
386
- - send-email: extract execute_cmd from recipients_cmd
628
+ (merged to 'next' on 2023-05-06 at 04514468b6)
629
+ + send-email: detect empty blank lines in command output
630
+ + send-email: add --header-cmd, --no-header-cmd options
631
+ + send-email: extract execute_cmd from recipients_cmd
632
633
"git send-email" learned "--header-cmd=<cmd>" that can inject
634
arbitrary e-mail header lines to the outgoing messages.
635
391
- Will merge to 'next'.
392
- source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
393
-
394
-
395
-* ob/t3501-retitle (2023-05-01) 1 commit
396
- (merged to 'next' on 2023-05-01 at 52730fcaaa)
397
- + t/t3501-revert-cherry-pick.sh: clarify scope of the file
398
-
399
- Retitle a test script with an overly narrow name.
400
-
636
Will merge to 'master'.
402
- source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de>
637
+ source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
638
639
640
* rs/test-ctype-eof (2023-05-02) 1 commit
@@ -440,8 +675,9 @@ Release tarballs are available at:
675
676
677
* ds/fsck-bitmap (2023-05-02) 2 commits
443
- - fsck: use local repository
444
- - fsck: verify checksums of all .bitmap files
678
+ (merged to 'next' on 2023-05-09 at c2148408a2)
679
+ + fsck: use local repository
680
+ + fsck: verify checksums of all .bitmap files
681
682
"git fsck" learned to detect bit-flip breakages in the reachability
683
bitmap files.
@@ -451,7 +687,8 @@ Release tarballs are available at:
687
688
689
* gc/trace-bare-repo-setup (2023-05-01) 1 commit
454
- - setup: trace bare repository setups
690
+ (merged to 'next' on 2023-05-06 at 72b977d2f9)
691
+ + setup: trace bare repository setups
692
693
The tracing mechanism learned to notice and report when
694
auto-discovered bare repositories are being used, as allowing so
@@ -459,12 +696,12 @@ Release tarballs are available at:
696
GIT_DIR for example) can be used with social engineering as an
697
attack vector.
698
462
- Will merge to 'next'.
699
+ Will merge to 'master'.
700
source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
701
702
466
-* cw/strbuf-cleanup (2023-05-03) 7 commits
467
- - strbuf: remove environment variables
703
+* cw/strbuf-cleanup (2023-05-08) 7 commits
704
+ - strbuf: remove global variable
705
- strbuf: clarify dependency
706
- path: move related function to path
707
- object-name: move related functions to object-name
@@ -476,7 +713,7 @@ Release tarballs are available at:
713
strbuf.[ch]
714
715
Comments?
479
- source: <20230503184849.1809304-1-calvinwan@google.com>
716
+ source: <20230508165728.525603-1-calvinwan@google.com>
717
718
719
* ah/doc-attributes-text (2023-05-03) 1 commit
@@ -490,39 +727,6 @@ Release tarballs are available at:
727
source: <20230503044656.221175-2-alexhenrie24@gmail.com>
728
729
493
-* jw/send-email-update-gmail-insn (2023-04-28) 1 commit
494
- (merged to 'next' on 2023-05-01 at cb5d83ee92)
495
- + send-email docs: Remove mention of discontinued gmail feature
496
-
497
- Doc update to drop use of deprecated app-specific password against
498
- gmail.
499
-
500
- Will merge to 'master'.
501
- source: <20221001104609.18453-1-j.witteveen@gmail.com>
502
-
503
-
504
-* ob/messages-capitalize-exception (2023-04-28) 1 commit
505
- (merged to 'next' on 2023-05-01 at db0ef42b3a)
506
- + messages: capitalization and punctuation exceptions
507
- (this branch uses ob/sequencer-i18n-fix.)
508
-
509
- Message update.
510
-
511
- Will merge to 'master'.
512
- source: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de>
513
-
514
-
515
-* ob/sequencer-i18n-fix (2023-04-28) 1 commit
516
- (merged to 'next' on 2023-05-01 at 242ca8ce15)
517
- + sequencer: actually translate report in do_exec()
518
- (this branch is used by ob/messages-capitalize-exception.)
519
-
520
- Message update.
521
-
522
- Will merge to 'master'.
523
- source: <20230428125649.1719796-2-oswald.buddenhagen@gmx.de>
524
-
525
-
730
* hx/negotiator-non-recursive (2023-04-26) 2 commits
731
(merged to 'next' on 2023-05-02 at 64f97cc72d)
732
+ negotiator/skipping: fix some problems in mark_common()
@@ -538,42 +742,30 @@ Release tarballs are available at:
742
743
744
* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
541
- - doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
745
+ (merged to 'next' on 2023-05-06 at 7bae4db4cc)
746
+ + doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
747
748
The documentation was misleading about the interaction between
749
GIT_DEFAULT_HASH and "git clone", which has been clarified to
750
stress that the variable is to be ignored by the command.
751
547
- Will merge to 'next'.
548
- source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
549
-
550
-
551
-* mh/fix-detect-compilers-with-nondigit-versions (2023-04-26) 1 commit
552
- (merged to 'next' on 2023-04-28 at c0c54291c2)
553
- + Handle some compiler versions containing a dash
554
-
555
- The detect-compilers script to help auto-tweaking the build system
556
- had trouble working with compilers whose version number has extra
557
- suffixes. The script has been taught that certain suffixes (like
558
- "-win32" in "gcc 10-win32") can be safely stripped as they share
559
- the same features and bugs with the version without the suffix.
560
-
752
Will merge to 'master'.
562
- source: <20230426004843.3391826-1-mh@glandium.org>
753
+ source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
754
755
756
* tl/notes-separator (2023-04-28) 6 commits
566
- - notes.c: introduce "--[no-]stripspace" option
567
- - notes.c: append separator instead of insert by pos
568
- - notes.c: introduce '--separator=<paragraph-break>' option
569
- - t3321: add test cases about the notes stripspace behavior
570
- - notes.c: use designated initializers for clarity
571
- - notes.c: cleanup 'strbuf_grow' call in 'append_edit'
757
+ (merged to 'next' on 2023-05-06 at 598ed19c9b)
758
+ + notes.c: introduce "--[no-]stripspace" option
759
+ + notes.c: append separator instead of insert by pos
760
+ + notes.c: introduce '--separator=<paragraph-break>' option
761
+ + t3321: add test cases about the notes stripspace behavior
762
+ + notes.c: use designated initializers for clarity
763
+ + notes.c: cleanup 'strbuf_grow' call in 'append_edit'
764
765
'git notes append' was taught '--separator' to specify string to insert
766
between paragraphs.
767
576
- Will merge to 'next'.
768
+ Will merge to 'master'.
769
source: <cover.1682671758.git.dyroneteng@gmail.com>
770
771
@@ -594,88 +786,40 @@ Release tarballs are available at:
786
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
787
788
597
-* jk/parse-commit-with-malformed-ident (2023-04-27) 4 commits
598
- (merged to 'next' on 2023-04-28 at cb6ea0412a)
599
- + parse_commit(): describe more date-parsing failure modes
600
- + parse_commit(): handle broken whitespace-only timestamp
601
- + parse_commit(): parse timestamp from end of line
602
- + t4212: avoid putting git on left-hand side of pipe
603
-
604
- The commit object parser has been taught to be a bit more lenient
605
- to parse timestamps on the author/committer line with a malformed
606
- author/committer ident.
607
-
608
- Will merge to 'master'.
609
- source: <20230427081330.GA1461786@coredump.intra.peff.net>
610
-
611
-
612
-* sl/sparse-write-tree-part-2 (2023-04-24) 1 commit
613
- - write-tree: optimize sparse integration
789
+* sl/sparse-write-tree-part-2 (2023-05-08) 1 commit
790
+ - t1092: update a write-tree test
791
792
Fix-up to a topic already graduated to 'master'.
793
617
- Expecting a reroll.
618
- cf. <20230423071243.1863977-1-cheskaqiqi@gmail.com>
619
- source: <20230423071243.1863977-1-cheskaqiqi@gmail.com>
794
+ Will merge to 'next'?
795
+ source: <20230508202140.464363-1-cheskaqiqi@gmail.com>
796
797
622
-* tb/pack-bitmap-traversal-with-boundary (2023-05-05) 2 commits
798
+* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
799
- pack-bitmap.c: use commit boundary during bitmap traversal
800
- pack-bitmap.c: extract `fill_in_bitmap()`
801
+ - object: add object_array initializer helper function
802
803
The object traversal using reachability bitmap done by
804
"pack-object" has been tweaked to take advantage of the fact that
805
using "boundary" commits as representative of all the uninteresting
806
ones can save quite a lot of object enumeration.
630
-
631
- Under discussion.
632
- cf. <4ce3ff5f-e7cd-f604-f5da-66939be7d314@github.com>
633
- source: <cover.1683307620.git.me@ttaylorr.com>
807
+ source: <cover.1683567065.git.me@ttaylorr.com>
808
809
810
* ar/config-count-tests-updates (2023-04-24) 3 commits
637
- - t1300: add tests for missing keys
638
- - t1300: check stderr for "ignores pairs" tests
639
- - t1300: drop duplicate test
811
+ (merged to 'next' on 2023-05-06 at c585a56132)
812
+ + t1300: add tests for missing keys
813
+ + t1300: check stderr for "ignores pairs" tests
814
+ + t1300: drop duplicate test
815
816
Test updates.
817
643
- Will merge to 'next'.
644
- source: <20230423134649.431783-1-rybak.a.v@gmail.com>
645
-
646
-
647
-* en/header-split-cache-h-part-2 (2023-04-24) 22 commits
648
- (merged to 'next' on 2023-05-01 at 722c412915)
649
- + reftable: ensure git-compat-util.h is the first (indirect) include
650
- + diff.h: reduce unnecessary includes
651
- + object-store.h: reduce unnecessary includes
652
- + commit.h: reduce unnecessary includes
653
- + fsmonitor: reduce includes of cache.h
654
- + cache.h: remove unnecessary headers
655
- + treewide: remove cache.h inclusion due to previous changes
656
- + cache,tree: move basic name compare functions from read-cache to tree
657
- + cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
658
- + hash-ll.h: split out of hash.h to remove dependency on repository.h
659
- + tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
660
- + dir.h: move DTYPE defines from cache.h
661
- + versioncmp.h: move declarations for versioncmp.c functions from cache.h
662
- + ws.h: move declarations for ws.c functions from cache.h
663
- + match-trees.h: move declarations for match-trees.c functions from cache.h
664
- + pkt-line.h: move declarations for pkt-line.c functions from cache.h
665
- + base85.h: move declarations for base85.c functions from cache.h
666
- + copy.h: move declarations for copy.c functions from cache.h
667
- + server-info.h: move declarations for server-info.c functions from cache.h
668
- + packfile.h: move pack_window and pack_entry from cache.h
669
- + symlinks.h: move declarations for symlinks.c functions from cache.h
670
- + treewide: be explicit about dependence on strbuf.h
671
-
672
- More header clean-up.
673
-
818
Will merge to 'master'.
675
- source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
819
+ source: <20230423134649.431783-1-rybak.a.v@gmail.com>
820
821
678
-* ps/fetch-output-format (2023-05-03) 8 commits
822
+* ps/fetch-output-format (2023-05-09) 8 commits
823
- fetch: introduce machine-parseable "porcelain" output format
824
- fetch: move option related variables into main function
825
- fetch: move display format parsing into main function
@@ -685,11 +829,11 @@ Release tarballs are available at:
829
- fetch: split out tests for output format
830
- fetch: fix `--no-recurse-submodules` with multi-remote fetches
831
688
- "git fetch" learned the "--output-format" option that emits what it
689
- did in a machine-parseable format.
832
+ "git fetch" learned the "--porcelain" option that emits what it did
833
+ in a machine-parseable format.
834
691
- Will merge to 'next'?
692
- source: <cover.1683113177.git.ps@pks.im>
835
+ Getting there.
836
+ source: <cover.1683636885.git.ps@pks.im>
837
838
839
* ma/gittutorial-fixes (2023-04-20) 2 commits
@@ -707,7 +851,6 @@ Release tarballs are available at:
851
- cocci: remove 'unused.cocci'
852
853
Retire a rather expensive-to-run Coccinelle check patch.
710
-
854
source: <20230420205350.600760-1-szeder.dev@gmail.com>
855
856
@@ -734,14 +877,15 @@ Release tarballs are available at:
877
878
879
* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
737
- - doc: interpret-trailers: fix example
738
- - doc: interpret-trailers: don’t use deprecated config
739
- - doc: interpret-trailers: use input redirection
740
- - doc: interpret-trailers: don’t use heredoc in examples
880
+ (merged to 'next' on 2023-05-06 at 4e9a640131)
881
+ + doc: interpret-trailers: fix example
882
+ + doc: interpret-trailers: don’t use deprecated config
883
+ + doc: interpret-trailers: use input redirection
884
+ + doc: interpret-trailers: don’t use heredoc in examples
885
886
Doc update.
887
744
- Will merge to 'next'.
888
+ Will merge to 'master'.
889
source: <cover.1682970213.git.code@khaugsbakk.name>
890
891
@@ -778,12 +922,13 @@ Release tarballs are available at:
922
923
924
* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
781
- - credential/wincred: store password_expiry_utc
925
+ (merged to 'next' on 2023-05-06 at 51aae61f60)
926
+ + credential/wincred: store password_expiry_utc
927
928
Teach the recently invented "password expiry time" trait to the
929
wincred credential helper.
930
786
- Will merge to 'next'.
931
+ Will merge to 'master'.
932
cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
933
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
934
@@ -799,37 +944,38 @@ Release tarballs are available at:
944
945
946
* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit
802
- - credential/libsecret: support password_expiry_utc
947
+ (merged to 'next' on 2023-05-09 at fd898e3756)
948
+ + credential/libsecret: support password_expiry_utc
949
950
The libsecret credential helper learns to handle the password
951
expiry time information.
952
807
- Will merge to 'next'?
953
+ Will merge to 'master'.
954
source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
955
956
811
-* sl/diff-files-sparse (2023-05-03) 2 commits
957
+* sl/diff-files-sparse (2023-05-09) 2 commits
958
- diff-files: integrate with sparse index
959
- t1092: add tests for `git diff-files`
960
961
Teach "diff-files" not to expand sparse-index unless needed.
962
817
- Expecting a hopefully minor and final reroll.
818
- cf. <xmqqpm7hm1yy.fsf@gitster.g>
819
- source: <20230503215549.511999-1-cheskaqiqi@gmail.com>
963
+ Will merge to 'next'?
964
+ source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
965
966
967
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
823
- - branch: avoid unnecessary worktrees traversals
824
- - branch: rename orphan branches in any worktree
825
- - branch: description for orphan branch errors
826
- - branch: use get_worktrees() in copy_or_rename_branch()
827
- - branch: test for failures while renaming branches
968
+ (merged to 'next' on 2023-05-06 at c61e9b0672)
969
+ + branch: avoid unnecessary worktrees traversals
970
+ + branch: rename orphan branches in any worktree
971
+ + branch: description for orphan branch errors
972
+ + branch: use get_worktrees() in copy_or_rename_branch()
973
+ + branch: test for failures while renaming branches
974
975
Error messages given when working on an unborn branch that is
976
checked out in another worktree have been improved.
977
832
- Will merge to 'next'.
978
+ Will merge to 'master'.
979
source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
980
981
--------------------------------------------------