What's cooking (2023/05 #04)
Junio C Hamano committed
May 11, 2023 at 16:34 UTC
36139febcc6c83748be8c787e099a3ef5f9adc27
1 file changed
+279
-374
whats-cooking.txt
+279
-374
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2023, #03; Tue, 9)
3
-X-master-at: 5597cfdf47db94825213fefe78c4485e6a5702d8
4
-X-next-at: 74a8c732097c5a952ed7b01bc0ef452daf5b8643
2
+Subject: What's cooking in git.git (May 2023, #04; Thu, 11)
3
+X-master-at: 5bc069e383539824fd3a0d897100d44bbe1f8a24
4
+X-next-at: 37aff9b760842c69945bb44bcc626aaca660805d
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2023, #03; Tue, 9)
7
+What's cooking in git.git (May 2023, #04; Thu, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,11 +16,6 @@ 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
-
19
Copies of the source code to Git live in many repositories, and the
20
following is a list of the ones I push into or their mirrors. Some
21
repositories have only a subset of branches.
@@ -50,241 +45,165 @@ Release tarballs are available at:
45
https://www.kernel.org/pub/software/scm/git/
46
47
--------------------------------------------------
53
-[Graduated to 'master']
48
+[New Topics]
49
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
-
81
- More header clean-up.
82
- source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
83
-
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
-
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
-
97
-
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
-
106
-
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
-
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
-
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
-
124
- Message update.
125
- source: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de>
126
-
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
-
133
- Message update.
134
- source: <20230428125649.1719796-2-oswald.buddenhagen@gmx.de>
135
-
136
-
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
-
141
- Retitle a test script with an overly narrow name.
142
- source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de>
50
+* js/rebase-count-fixes (2023-05-10) 2 commits
51
+ - rebase -r: fix the total number shown in the progress
52
+ - rebase --update-refs: fix loops
53
144
---------------------------------------------------
145
-[New Topics]
54
+ A few bugs in the sequencer machinery that results in miscounting
55
+ the steps have been corrected.
56
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
57
+ Waiting for responses to reviews.
58
+ cf. <b481d212-89c5-5c8e-c99f-6df3909523c7@gmail.com>
59
+ source: <pull.1531.git.1683759338.gitgitgadget@gmail.com>
60
151
- A test fix.
61
+
62
+* ds/merge-tree-use-config (2023-05-10) 1 commit
63
+ (merged to 'next' on 2023-05-11 at e0dab53028)
64
+ + merge-tree: load default git config
65
+
66
+ Allow git forges to disable replace-refs feature while running "git
67
+ merge-tree".
68
69
Will merge to 'master'.
154
- source: <xmqqild5rvvw.fsf@gitster.g>
70
+ source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com>
71
72
+--------------------------------------------------
73
+[Graduated to 'master']
74
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
75
+* ah/doc-attributes-text (2023-05-03) 1 commit
76
+ (merged to 'next' on 2023-05-04 at 121c97817e)
77
+ + docs: rewrite the documentation of the text and eol attributes
78
161
- "git push --all" gained an alias "git push --branches".
79
+ Doc update to clarify how text and eol attributes interact to
80
+ specify the end-of-line conversion.
81
+ source: <20230503044656.221175-2-alexhenrie24@gmail.com>
82
163
- Will merge to 'master'.
164
- source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
83
84
+* ar/test-cleanup-unused-file-creation-part2 (2023-05-03) 6 commits
85
+ (merged to 'next' on 2023-05-03 at 185f0ec195)
86
+ + t2019: don't create unused files
87
+ + t1502: don't create unused files
88
+ + t1450: don't create unused files
89
+ + t1300: don't create unused files
90
+ + t1300: fix config file syntax error descriptions
91
+ + t0300: don't create unused file
92
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
93
+ Test cleanup.
94
+ cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com>
95
+ source: <20230417191044.909094-1-rybak.a.v@gmail.com>
96
194
- source: <pull.1525.git.1683431149.gitgitgadget@gmail.com>
97
98
+* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit
99
+ (merged to 'next' on 2023-05-04 at c2fd654367)
100
+ + doc: remove custom callouts format
101
197
-* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
198
- - subtree: support long global flags
102
+ Our custom callout formatter is no longer used in the documentation
103
+ formatting toolchain, as the upstream default ones give better
104
+ output these days.
105
+ source: <20230418011828.47851-1-felipe.contreras@gmail.com>
106
200
- "git subtree" (in contrib/) update.
107
202
- Will merge to 'next'.
203
- source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
108
+* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit
109
+ (merged to 'next' on 2023-05-04 at d048eb1ef8)
110
+ + doc: manpage: remove maximum title length
111
112
+ The titles of manual pages used to be chomped at an unreasonably
113
+ short limit, which has been removed.
114
+ source: <20230503171658.8996-1-felipe.contreras@gmail.com>
115
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
116
212
- Gitk updates from GfW project.
117
+* hx/negotiator-non-recursive (2023-04-26) 2 commits
118
+ (merged to 'next' on 2023-05-02 at 64f97cc72d)
119
+ + negotiator/skipping: fix some problems in mark_common()
120
+ + negotiator/default: avoid stack overflow
121
214
- Will merge to 'master'.
215
- source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
122
+ The implementation of the default "negotiator", used to find common
123
+ ancestor over the network for object tranfer, used to be recursive;
124
+ it was updated to be iterative to conserve stackspace usage.
125
+ cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com>
126
+ source: <cover.1682513384.git.hanxin.hx@bytedance.com>
127
128
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
129
+* ma/gittutorial-fixes (2023-04-20) 2 commits
130
+ (merged to 'next' on 2023-05-02 at bf96011972)
131
+ + gittutorial: wrap literal examples in backticks
132
+ + gittutorial: drop early mention of origin
133
231
- Doc update.
134
+ Doc fixes.
135
+ source: <cover.1681579244.git.martin.agren@gmail.com>
136
233
- Needs review.
234
- source: <pull.1506.git.git.1683566870.gitgitgadget@gmail.com>
137
138
+* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
139
+ (merged to 'next' on 2023-05-04 at 9ade4aa024)
140
+ + credential: new attribute oauth_refresh_token
141
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
142
+ The credential subsystem learns to help OAuth framework.
143
+ source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
144
241
- Test fix.
145
243
- Will merge to 'master'.
244
- source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
146
+* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
147
+ (merged to 'next' on 2023-05-06 at 51aae61f60)
148
+ + credential/wincred: store password_expiry_utc
149
150
+ Teach the recently invented "password expiry time" trait to the
151
+ wincred credential helper.
152
+ cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
153
+ source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
154
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
155
265
- source: <20230509175347.1714141-1-christian.couder@gmail.com>
156
+* mh/use-wincred-from-system (2023-03-27) 1 commit
157
+ (merged to 'next' on 2023-05-06 at a545c5d4aa)
158
+ + credential/wincred: include wincred.h
159
160
+ Code clean-up.
161
+ cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
162
+ cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
163
+ source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
164
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
165
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>
166
+* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits
167
+ (merged to 'next' on 2023-05-03 at ba7079bcd4)
168
+ + send-email: expose header information to git-send-email's sendemail-validate hook
169
+ + send-email: refactor header generation functions
170
+
171
+ "git send-email" learned to give the e-mail headers to the validate
172
+ hook by passing an extra argument from the command line.
173
+ source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
174
175
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
176
+* rs/test-ctype-eof (2023-05-02) 1 commit
177
+ (merged to 'next' on 2023-05-02 at a19201a6a9)
178
+ + test-ctype: check EOF
179
284
- Retire "verbose" helper function from the test framework.
180
+ ctype tests have been taught to test EOF, too.
181
+ source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
182
286
- Will merge to 'master'.
287
- source: <20230508185953.GA2108869@coredump.intra.peff.net>
183
+
184
+* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit
185
+ (merged to 'next' on 2023-05-04 at a4b1b128d6)
186
+ + docs: clarify git rm --cached function in gitignore note
187
+
188
+ Doc update.
189
+ source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
190
+
191
+
192
+* tb/credential-long-lines (2023-05-01) 7 commits
193
+ (merged to 'next' on 2023-05-02 at f027002b92)
194
+ + contrib/credential: embiggen fixed-size buffer in wincred
195
+ + contrib/credential: avoid fixed-size buffer in libsecret
196
+ + contrib/credential: .gitignore libsecret build artifacts
197
+ + contrib/credential: remove 'gnome-keyring' credential helper
198
+ + contrib/credential: avoid fixed-size buffer in osxkeychain
199
+ + t/lib-credential.sh: ensure credential helpers handle long headers
200
+ + credential.c: store "wwwauth[]" values in `credential_read()`
201
+
202
+ The implementation of credential helpers used fgets() over fixed
203
+ size buffers to read protocol messages, causing the remainder of
204
+ the folded long line to trigger unexpected behaviour, which has
205
+ been corrected.
206
+ source: <cover.1682956419.git.me@ttaylorr.com>
207
208
--------------------------------------------------
209
[Stalled]
@@ -384,20 +303,15 @@ Release tarballs are available at:
303
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
304
305
387
-* ab/tag-object-type-errors (2022-11-22) 5 commits
306
+* ab/tag-object-type-errors (2023-05-10) 4 commits
307
- tag: don't emit potentially incorrect "object is a X, not a Y"
308
- tag: don't misreport type of tagged objects in errors
309
- object tests: add test for unexpected objects in tags
391
- - object-file.c: free the "t.tag" in check_tag()
310
- Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
311
312
Hardening checks around mismatched object types when one of those
313
objects is a tag.
396
-
397
- Expecting a reroll.
398
- cf. <xmqqzgb5jz5c.fsf@gitster.g>
399
- cf. <xmqqsfgxjugi.fsf@gitster.g>
400
- source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
314
+ source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
315
316
317
* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
@@ -442,17 +356,15 @@ Release tarballs are available at:
356
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
357
358
445
-* tc/cat-file-z-use-cquote (2023-03-03) 2 commits
446
- . cat-file: quote-format name in error when using -z
447
- . cat-file: extract printing batch error message into function
359
+* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
360
+ - cat-file: quote-format name in error when using -z
361
362
"cat-file" in the batch mode that is fed NUL-terminated pathnames
363
learned to cquote them in its error output (otherwise, a funny
364
pathname with LF in it would break the lines in the output stream).
365
453
- Breaks "cat-file --batch-all-objects --batch-check".
454
- cf. <xmqqilfhctrr.fsf@gitster.g>
455
- source: <20230303191708.77894-1-toon@iotcl.com>
366
+ Will merge to 'next'?
367
+ source: <20230510190116.795641-2-toon@iotcl.com>
368
369
370
* cw/submodule-status-in-parallel (2023-03-02) 6 commits
@@ -474,38 +386,153 @@ Release tarballs are available at:
386
--------------------------------------------------
387
[Cooking]
388
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
389
+* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
390
+ (merged to 'next' on 2023-05-09 at f4d7a7d671)
391
+ + t9800: correct misuse of 'show -s --raw' in a test
392
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.
393
+ A test fix.
394
395
Will merge to 'master'.
486
- source: <20230418011828.47851-1-felipe.contreras@gmail.com>
396
+ source: <xmqqild5rvvw.fsf@gitster.g>
397
398
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
399
+* tl/push-branches-is-an-alias-for-all (2023-05-06) 1 commit
400
+ (merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
401
+ + push: introduce '--branches' option
402
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.
403
+ "git push --all" gained an alias "git push --branches".
404
405
Will merge to 'master'.
498
- source: <20230503171658.8996-1-felipe.contreras@gmail.com>
406
+ source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
407
408
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
409
+* en/header-split-cache-h-part-3 (2023-05-08) 25 commits
410
+ - fsmonitor-ll.h: split this header out of fsmonitor.h
411
+ - hash-ll, hashmap: move oidhash() to hash-ll
412
+ - git-compat-util.h: remove unneccessary include of wildmatch.h
413
+ - builtin.h: remove unneccessary includes
414
+ - list-objects-filter-options.h: remove unneccessary include
415
+ - diff.h: remove unnecessary include of oidset.h
416
+ - repository: remove unnecessary include of path.h
417
+ - log-tree: replace include of revision.h with simple forward declaration
418
+ - cache.h: remove this no-longer-used header
419
+ - read-cache*.h: move declarations for read-cache.c functions from cache.h
420
+ - repository.h: move declaration of the_index from cache.h
421
+ - merge.h: move declarations for merge.c from cache.h
422
+ - diff.h: move declaration for global in diff.c from cache.h
423
+ - preload-index.h: move declarations for preload-index.c from elsewhere
424
+ - sparse-index.h: move declarations for sparse-index.c from cache.h
425
+ - name-hash.h: move declarations for name-hash.c from cache.h
426
+ - run-command.h: move declarations for run-command.c from cache.h
427
+ - statinfo: move stat_{data,validity} functions from cache/read-cache
428
+ - read-cache: move shared add/checkout/commit code
429
+ - add: modify add_files_to_cache() to avoid globals
430
+ - read-cache: move shared commit and ls-files code
431
+ - setup: adopt shared init-db & clone code
432
+ - init-db, clone: change unnecessary global into passed parameter
433
+ - init-db: remove unnecessary global variable & document existing bug
434
+ - Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
435
+
436
+ Header files cleanup.
437
+
438
+ Needs review.
439
+ source: <pull.1525.git.1683431149.gitgitgadget@gmail.com>
440
+
441
+
442
+* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
443
+ (merged to 'next' on 2023-05-10 at 2980db981e)
444
+ + subtree: support long global flags
445
+
446
+ "git subtree" (in contrib/) update.
447
+
448
+ Will merge to 'master'.
449
+ source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
450
+
451
+
452
+* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
453
+ (merged to 'next' on 2023-05-08 at adb334deec)
454
+ + Merge gitk changes into js/gitk-fixes-from-gfw
455
+ + gitk: escape file paths before piping to git log
456
+ + gitk: prevent overly long command lines
457
+
458
+ Gitk updates from GfW project.
459
+
460
+ Will merge to 'master'.
461
+ source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
462
+
463
+
464
+* la/doc-interpret-trailers (2023-05-11) 9 commits
465
+ - doc: trailer: add more examples in DESCRIPTION
466
+ - doc: trailer: mention 'key' in DESCRIPTION
467
+ - doc: trailer.<token>.command: emphasize deprecation
468
+ - doc: trailer: use angle brackets for <token> and <value>
469
+ - doc: trailer: remove redundant phrasing
470
+ - doc: trailer: examples: avoid the word "message" by itself
471
+ - doc: trailer: drop "commit message part" phrasing
472
+ - doc: trailer: swap verb order
473
+ - doc: trailer: fix grammar
474
475
Doc update.
476
477
+ On hold. Looking good.
478
+ Want to be rebased once kh/doc-interpret-trailers-updates lands.
479
+ source: <pull.1506.v2.git.git.1683839975.gitgitgadget@gmail.com>
480
+
481
+
482
+* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
483
+ (merged to 'next' on 2023-05-09 at 7734f3d690)
484
+ + test: rev-parse-upstream: add missing cmp
485
+
486
+ Test fix.
487
+
488
Will merge to 'master'.
508
- source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
489
+ source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
490
+
491
+
492
+* cc/git-replay (2023-05-09) 16 commits
493
+ - SQUASH???
494
+ - replay: stop assuming replayed branches do not diverge
495
+ - replay: add --contained to rebase contained branches
496
+ - replay: add --advance or 'cherry-pick' mode
497
+ - replay: disallow revision specific options and pathspecs
498
+ - replay: use standard revision ranges
499
+ - replay: make it a minimal server side command
500
+ - replay: remove HEAD related sanity check
501
+ - replay: remove progress and info output
502
+ - replay: add an important FIXME comment about gpg signing
503
+ - replay: don't simplify history
504
+ - replay: introduce pick_regular_commit()
505
+ - replay: die() instead of failing assert()
506
+ - replay: start using parse_options API
507
+ - replay: introduce new builtin
508
+ - t6429: remove switching aspects of fast-rebase
509
+
510
+ source: <20230509175347.1714141-1-christian.couder@gmail.com>
511
+
512
+
513
+* jc/pack-ref-exclude-include (2023-05-11) 4 commits
514
+ - pack-refs: teach pack-refs --include option
515
+ - revision: modify ref_exclusions to handle inclusions
516
+ - pack-refs: teach --exclude option to exclude refs from being packed
517
+ - docs: clarify git-pack-refs --all will pack all refs
518
+
519
+ "git pack-refs" learns "--include" and "--exclude" to tweak the ref
520
+ hierarchy to be packed using pattern matching.
521
+
522
+ Needs review.
523
+ source: <pull.1501.v3.git.git.1683828635.gitgitgadget@gmail.com>
524
+
525
+
526
+* jk/test-verbose-no-more (2023-05-08) 3 commits
527
+ (merged to 'next' on 2023-05-09 at 897bfd0a6b)
528
+ + t: drop "verbose" helper function
529
+ + t7001: use "ls-files --format" instead of "cut"
530
+ + t7001: avoid git on upstream of pipe
531
+
532
+ Retire "verbose" helper function from the test framework.
533
+
534
+ Will merge to 'master'.
535
+ source: <20230508185953.GA2108869@coredump.intra.peff.net>
536
537
538
* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
@@ -601,26 +628,15 @@ Release tarballs are available at:
628
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
629
630
604
-* mh/use-wincred-from-system (2023-03-27) 1 commit
605
- (merged to 'next' on 2023-05-06 at a545c5d4aa)
606
- + credential/wincred: include wincred.h
607
-
608
- Code clean-up.
609
-
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
-
631
* jc/attr-source-tree (2023-05-06) 1 commit
617
- - attr: teach "--attr-source=<tree>" global option to "git"
632
+ (merged to 'next' on 2023-05-10 at cb94f4fba6)
633
+ + attr: teach "--attr-source=<tree>" global option to "git"
634
635
"git --attr-source=<tree> cmd $args" is a new way to have any
636
command to read attributes not from the working tree but from the
637
given tree object.
638
623
- Will merge to 'next'.
639
+ Will merge to 'master'.
640
source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
641
642
@@ -637,35 +653,6 @@ Release tarballs are available at:
653
source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
654
655
640
-* rs/test-ctype-eof (2023-05-02) 1 commit
641
- (merged to 'next' on 2023-05-02 at a19201a6a9)
642
- + test-ctype: check EOF
643
-
644
- ctype tests have been taught to test EOF, too.
645
-
646
- Will merge to 'master'.
647
- source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
648
-
649
-
650
-* tb/credential-long-lines (2023-05-01) 7 commits
651
- (merged to 'next' on 2023-05-02 at f027002b92)
652
- + contrib/credential: embiggen fixed-size buffer in wincred
653
- + contrib/credential: avoid fixed-size buffer in libsecret
654
- + contrib/credential: .gitignore libsecret build artifacts
655
- + contrib/credential: remove 'gnome-keyring' credential helper
656
- + contrib/credential: avoid fixed-size buffer in osxkeychain
657
- + t/lib-credential.sh: ensure credential helpers handle long headers
658
- + credential.c: store "wwwauth[]" values in `credential_read()`
659
-
660
- The implementation of credential helpers used fgets() over fixed
661
- size buffers to read protocol messages, causing the remainder of
662
- the folded long line to trigger unexpected behaviour, which has
663
- been corrected.
664
-
665
- Will merge to 'master'.
666
- source: <cover.1682956419.git.me@ttaylorr.com>
667
-
668
-
656
* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
657
- upload-pack: advertise capabilities when cloning empty repos
658
@@ -700,7 +687,7 @@ Release tarballs are available at:
687
source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
688
689
703
-* cw/strbuf-cleanup (2023-05-08) 7 commits
690
+* cw/strbuf-cleanup (2023-05-11) 7 commits
691
- strbuf: remove global variable
692
- strbuf: clarify dependency
693
- path: move related function to path
@@ -712,33 +699,8 @@ Release tarballs are available at:
699
Move functions that are not about pure string manipulation out of
700
strbuf.[ch]
701
715
- Comments?
716
- source: <20230508165728.525603-1-calvinwan@google.com>
717
-
718
-
719
-* ah/doc-attributes-text (2023-05-03) 1 commit
720
- (merged to 'next' on 2023-05-04 at 121c97817e)
721
- + docs: rewrite the documentation of the text and eol attributes
722
-
723
- Doc update to clarify how text and eol attributes interact to
724
- specify the end-of-line conversion.
725
-
726
- Will merge to 'master'.
727
- source: <20230503044656.221175-2-alexhenrie24@gmail.com>
728
-
729
-
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()
733
- + negotiator/default: avoid stack overflow
734
-
735
- The implementation of the default "negotiator", used to find common
736
- ancestor over the network for object tranfer, used to be recursive;
737
- it was updated to be iterative to conserve stackspace usage.
738
-
739
- Will merge to 'master'.
740
- cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com>
741
- source: <cover.1682513384.git.hanxin.hx@bytedance.com>
702
+ Will merge to 'next'?
703
+ source: <20230511194446.1492907-1-calvinwan@google.com>
704
705
706
* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
@@ -819,12 +781,13 @@ Release tarballs are available at:
781
source: <20230423134649.431783-1-rybak.a.v@gmail.com>
782
783
822
-* ps/fetch-output-format (2023-05-09) 8 commits
784
+* ps/fetch-output-format (2023-05-10) 9 commits
785
- fetch: introduce machine-parseable "porcelain" output format
786
- fetch: move option related variables into main function
825
- - fetch: move display format parsing into main function
787
+ - fetch: lift up parsing of "fetch.output" config variable
788
- fetch: introduce `display_format` enum
827
- - fetch: fix missing from-reference when fetching HEAD:foo
789
+ - fetch: refactor calculation of the display table width
790
+ - fetch: print left-hand side when fetching HEAD:foo
791
- fetch: add a test to exercise invalid output formats
792
- fetch: split out tests for output format
793
- fetch: fix `--no-recurse-submodules` with multi-remote fetches
@@ -832,38 +795,17 @@ Release tarballs are available at:
795
"git fetch" learned the "--porcelain" option that emits what it did
796
in a machine-parseable format.
797
835
- Getting there.
836
- source: <cover.1683636885.git.ps@pks.im>
837
-
838
-
839
-* ma/gittutorial-fixes (2023-04-20) 2 commits
840
- (merged to 'next' on 2023-05-02 at bf96011972)
841
- + gittutorial: wrap literal examples in backticks
842
- + gittutorial: drop early mention of origin
843
-
844
- Doc fixes.
845
-
846
- Will merge to 'master'.
847
- source: <cover.1681579244.git.martin.agren@gmail.com>
798
+ Will merge to 'next'?
799
+ source: <cover.1683721293.git.ps@pks.im>
800
801
802
* sg/retire-unused-cocci (2023-04-20) 1 commit
803
- cocci: remove 'unused.cocci'
804
805
Retire a rather expensive-to-run Coccinelle check patch.
854
- source: <20230420205350.600760-1-szeder.dev@gmail.com>
855
-
856
-
857
-* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits
858
- (merged to 'next' on 2023-05-03 at ba7079bcd4)
859
- + send-email: expose header information to git-send-email's sendemail-validate hook
860
- + send-email: refactor header generation functions
861
-
862
- "git send-email" learned to give the e-mail headers to the validate
863
- hook by passing an extra argument from the command line.
806
865
- Will merge to 'master'.
866
- source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
807
+ Will merge to 'next'.
808
+ source: <20230420205350.600760-1-szeder.dev@gmail.com>
809
810
811
* gc/doc-cocci-updates (2023-04-27) 2 commits
@@ -905,44 +847,6 @@ Release tarballs are available at:
847
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
848
849
908
-* ar/test-cleanup-unused-file-creation-part2 (2023-05-03) 6 commits
909
- (merged to 'next' on 2023-05-03 at 185f0ec195)
910
- + t2019: don't create unused files
911
- + t1502: don't create unused files
912
- + t1450: don't create unused files
913
- + t1300: don't create unused files
914
- + t1300: fix config file syntax error descriptions
915
- + t0300: don't create unused file
916
-
917
- Test cleanup.
918
-
919
- Will merge to 'master'.
920
- cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com>
921
- source: <20230417191044.909094-1-rybak.a.v@gmail.com>
922
-
923
-
924
-* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
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
-
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
-
935
-
936
-* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
937
- (merged to 'next' on 2023-05-04 at 9ade4aa024)
938
- + credential: new attribute oauth_refresh_token
939
-
940
- The credential subsystem learns to help OAuth framework.
941
-
942
- Will merge to 'master'.
943
- source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
944
-
945
-
850
* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit
851
(merged to 'next' on 2023-05-09 at fd898e3756)
852
+ credential/libsecret: support password_expiry_utc
@@ -960,7 +864,8 @@ Release tarballs are available at:
864
865
Teach "diff-files" not to expand sparse-index unless needed.
866
963
- Will merge to 'next'?
867
+ Will merge to 'next'.
868
+ cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com>
869
source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
870
871