What's cooking (2023/05 #05)
Junio C Hamano committed
May 16, 2023 at 16:24 UTC
8f153922d468ab8dd0e1f26c3956d5a135a36845
1 file changed
+320
-390
whats-cooking.txt
+320
-390
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2023, #04; Thu, 11)
3
-X-master-at: 5bc069e383539824fd3a0d897100d44bbe1f8a24
4
-X-next-at: 37aff9b760842c69945bb44bcc626aaca660805d
2
+Subject: What's cooking in git.git (May 2023, #05; Tue, 16)
3
+X-master-at: 0df2c180904f6b709766f9c24669a9d01543f915
4
+X-next-at: b87f41e99e62330abb8a140c6bb46d61a0bfd809
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2023, #04; Thu, 11)
7
+What's cooking in git.git (May 2023, #05; Tue, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,6 +16,12 @@ 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
+Git 2.41-rc0 has been tagged. Hopefully we will merge a few more
20
+topics by -rc1 and then go into pre-release feature freeze.
21
+Starting next week, until early June, my availability may be
22
+sporadic, but this time I won't be completely away from the keyboard
23
+to require an interrim maintainer.
24
+
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
27
repositories have only a subset of branches.
@@ -45,18 +51,34 @@ Release tarballs are available at:
51
https://www.kernel.org/pub/software/scm/git/
52
53
--------------------------------------------------
48
-[New Topics]
54
+[Graduated to 'master']
55
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
56
+* ar/config-count-tests-updates (2023-04-24) 3 commits
57
+ (merged to 'next' on 2023-05-06 at c585a56132)
58
+ + t1300: add tests for missing keys
59
+ + t1300: check stderr for "ignores pairs" tests
60
+ + t1300: drop duplicate test
61
54
- A few bugs in the sequencer machinery that results in miscounting
55
- the steps have been corrected.
62
+ Test updates.
63
+ source: <20230423134649.431783-1-rybak.a.v@gmail.com>
64
+
65
+
66
+* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
67
+ (merged to 'next' on 2023-05-09 at 7734f3d690)
68
+ + test: rev-parse-upstream: add missing cmp
69
+
70
+ Test fix.
71
+ source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
72
+
73
+
74
+* ds/fsck-bitmap (2023-05-02) 2 commits
75
+ (merged to 'next' on 2023-05-09 at c2148408a2)
76
+ + fsck: use local repository
77
+ + fsck: verify checksums of all .bitmap files
78
57
- Waiting for responses to reviews.
58
- cf. <b481d212-89c5-5c8e-c99f-6df3909523c7@gmail.com>
59
- source: <pull.1531.git.1683759338.gitgitgadget@gmail.com>
79
+ "git fsck" learned to detect bit-flip breakages in the reachability
80
+ bitmap files.
81
+ source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
82
83
84
* ds/merge-tree-use-config (2023-05-10) 1 commit
@@ -65,145 +87,270 @@ Release tarballs are available at:
87
88
Allow git forges to disable replace-refs feature while running "git
89
merge-tree".
68
-
69
- Will merge to 'master'.
90
source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com>
91
72
---------------------------------------------------
73
-[Graduated to 'master']
92
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
93
+* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
94
+ (merged to 'next' on 2023-05-06 at 1eda43b03f)
95
+ + doc-diff: drop SOURCE_DATE_EPOCH override
96
+ + doc: doc-diff: specify date
97
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>
98
+ An earlier change broke "doc-diff", which has been corrected.
99
+ source: <20230503232349.59997-1-felipe.contreras@gmail.com>
100
+ source: <20230505211610.GA3197168@coredump.intra.peff.net>
101
102
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
103
+* gc/trace-bare-repo-setup (2023-05-01) 1 commit
104
+ (merged to 'next' on 2023-05-06 at 72b977d2f9)
105
+ + setup: trace bare repository setups
106
93
- Test cleanup.
94
- cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com>
95
- source: <20230417191044.909094-1-rybak.a.v@gmail.com>
107
+ The tracing mechanism learned to notice and report when
108
+ auto-discovered bare repositories are being used, as allowing so
109
+ without explicitly stating the user intends to do so (with setting
110
+ GIT_DIR for example) can be used with social engineering as an
111
+ attack vector.
112
+ source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
113
114
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
115
+* jc/dirstat-plug-leaks (2023-05-05) 2 commits
116
+ (merged to 'next' on 2023-05-09 at 2df7cf06e4)
117
+ + diff: plug leaks in dirstat
118
+ + diff: refactor common tail part of dirstat computation
119
+ (this branch is used by jc/diff-s-with-other-options.)
120
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>
121
+ "git diff --dirstat" leaked memory, which has been plugged.
122
+ source: <20230505211917.2746751-1-gitster@pobox.com>
123
124
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
125
+* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
126
+ (merged to 'next' on 2023-05-06 at 7bae4db4cc)
127
+ + doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
128
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>
129
+ The documentation was misleading about the interaction between
130
+ GIT_DEFAULT_HASH and "git clone", which has been clarified to
131
+ stress that the variable is to be ignored by the command.
132
+ source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
133
134
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
135
+* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
136
+ (merged to 'next' on 2023-05-09 at 0db4f08e32)
137
+ + name-rev: make --stdin hidden
138
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>
139
+ The "--stdin" option of "git name-rev" has been replaced with
140
+ the "--annotate-stdin" option more than a year ago. We stop
141
+ advertising it in the "git name-rev -h" output.
142
+ source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
143
144
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
145
+* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
146
+ (merged to 'next' on 2023-05-09 at f4d7a7d671)
147
+ + t9800: correct misuse of 'show -s --raw' in a test
148
134
- Doc fixes.
135
- source: <cover.1681579244.git.martin.agren@gmail.com>
149
+ A test fix.
150
+ source: <xmqqild5rvvw.fsf@gitster.g>
151
152
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
153
+* jk/test-verbose-no-more (2023-05-08) 3 commits
154
+ (merged to 'next' on 2023-05-09 at 897bfd0a6b)
155
+ + t: drop "verbose" helper function
156
+ + t7001: use "ls-files --format" instead of "cut"
157
+ + t7001: avoid git on upstream of pipe
158
142
- The credential subsystem learns to help OAuth framework.
143
- source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
159
+ Retire "verbose" helper function from the test framework.
160
+ source: <20230508185953.GA2108869@coredump.intra.peff.net>
161
162
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
163
+* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
164
+ (merged to 'next' on 2023-05-08 at adb334deec)
165
+ + Merge gitk changes into js/gitk-fixes-from-gfw
166
+ + gitk: escape file paths before piping to git log
167
+ + gitk: prevent overly long command lines
168
+
169
+ Gitk updates from GfW project.
170
+ source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
171
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>
172
173
+* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
174
+ (merged to 'next' on 2023-05-10 at 2980db981e)
175
+ + subtree: support long global flags
176
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
177
+ "git subtree" (in contrib/) update.
178
+ source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
179
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>
180
+
181
+* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
182
+ (merged to 'next' on 2023-05-06 at 4e9a640131)
183
+ + doc: interpret-trailers: fix example
184
+ + doc: interpret-trailers: don’t use deprecated config
185
+ + doc: interpret-trailers: use input redirection
186
+ + doc: interpret-trailers: don’t use heredoc in examples
187
+
188
+ Doc update.
189
+ source: <cover.1682970213.git.code@khaugsbakk.name>
190
+
191
+
192
+* mc/send-email-header-cmd (2023-05-01) 3 commits
193
+ (merged to 'next' on 2023-05-06 at 04514468b6)
194
+ + send-email: detect empty blank lines in command output
195
+ + send-email: add --header-cmd, --no-header-cmd options
196
+ + send-email: extract execute_cmd from recipients_cmd
197
+
198
+ "git send-email" learned "--header-cmd=<cmd>" that can inject
199
+ arbitrary e-mail header lines to the outgoing messages.
200
+ source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
201
+
202
+
203
+* ps/fetch-output-format (2023-05-10) 9 commits
204
+ (merged to 'next' on 2023-05-12 at 4126a008a5)
205
+ + fetch: introduce machine-parseable "porcelain" output format
206
+ + fetch: move option related variables into main function
207
+ + fetch: lift up parsing of "fetch.output" config variable
208
+ + fetch: introduce `display_format` enum
209
+ + fetch: refactor calculation of the display table width
210
+ + fetch: print left-hand side when fetching HEAD:foo
211
+ + fetch: add a test to exercise invalid output formats
212
+ + fetch: split out tests for output format
213
+ + fetch: fix `--no-recurse-submodules` with multi-remote fetches
214
+
215
+ "git fetch" learned the "--porcelain" option that emits what it did
216
+ in a machine-parseable format.
217
+ source: <cover.1683721293.git.ps@pks.im>
218
+
219
+
220
+* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
221
+ (merged to 'next' on 2023-05-06 at c61e9b0672)
222
+ + branch: avoid unnecessary worktrees traversals
223
+ + branch: rename orphan branches in any worktree
224
+ + branch: description for orphan branch errors
225
+ + branch: use get_worktrees() in copy_or_rename_branch()
226
+ + branch: test for failures while renaming branches
227
+
228
+ Error messages given when working on an unborn branch that is
229
+ checked out in another worktree have been improved.
230
+ source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
231
232
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
233
+* sg/retire-unused-cocci (2023-04-20) 1 commit
234
+ (merged to 'next' on 2023-05-12 at 77cc27c837)
235
+ + cocci: remove 'unused.cocci'
236
+
237
+ Retire a rather expensive-to-run Coccinelle check patch.
238
+ source: <20230420205350.600760-1-szeder.dev@gmail.com>
239
+
240
+
241
+* sl/diff-files-sparse (2023-05-09) 2 commits
242
+ (merged to 'next' on 2023-05-12 at 486be95d1b)
243
+ + diff-files: integrate with sparse index
244
+ + t1092: add tests for `git diff-files`
245
+
246
+ Teach "diff-files" not to expand sparse-index unless needed.
247
+ cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com>
248
+ source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
249
+
250
+
251
+* tl/push-branches-is-an-alias-for-all (2023-05-12) 2 commits
252
+ (merged to 'next' on 2023-05-12 at 536aaf0bd9)
253
+ + t5583: fix shebang line
254
+ (merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
255
+ + push: introduce '--branches' option
256
+
257
+ "git push --all" gained an alias "git push --branches".
258
+ source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
259
+ source: <pull.1532.git.1683904156670.gitgitgadget@gmail.com>
260
+
261
+--------------------------------------------------
262
+[New Topics]
263
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>
264
+* cg/doc-http-lowspeed-limit (2023-05-14) 1 commit
265
+ - doc/git-config: add unit for http.lowSpeedLimit
266
267
+ Doc update.
268
+
269
+ Will merge to 'next'.
270
+ source: <pull.1507.git.git.1683970203084.gitgitgadget@gmail.com>
271
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
272
180
- ctype tests have been taught to test EOF, too.
181
- source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
273
+* kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits
274
+ - tag: keep the message file in case ref transaction fails
275
+ - t/t7004-tag: add regression test for successful tag creation
276
+ - doc: tag: document `TAG_EDITMSG`
277
278
+ "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the
279
+ command failed, so that the user can salvage what they typed.
280
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
281
+ Will merge to 'next'.
282
+ source: <cover.1684258780.git.code@khaugsbakk.name>
283
+
284
+
285
+* sa/doc-ls-remote (2023-05-15) 6 commits
286
+ - ls-remote doc: document the output format
287
+ - ls-remote doc: explain what each example does
288
+ - ls-remote doc: show peeled tags in examples
289
+ - ls-remote doc: remove redundant --tags example
290
+ - show-branch doc: say <ref>, not <reference>
291
+ - show-ref doc: update for internal consistency
292
293
Doc update.
189
- source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
294
295
+ Expecting a minor and hopefully final reroll.
296
+ source: <pull.1471.v3.git.git.1684152793.gitgitgadget@gmail.com>
297
+
298
+
299
+* tb/refs-exclusion-and-packed-refs (2023-05-15) 16 commits
300
+ - ls-refs.c: avoid enumerating hidden refs where possible
301
+ - upload-pack.c: avoid enumerating hidden refs where possible
302
+ - builtin/receive-pack.c: avoid enumerating hidden references
303
+ - refs.h: let `for_each_namespaced_ref()` take excluded patterns
304
+ - refs/packed-backend.c: ignore complicated hidden refs rules
305
+ - revision.h: store hidden refs in a `strvec`
306
+ - refs/packed-backend.c: add trace2 counters for jump list
307
+ - refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
308
+ - refs/packed-backend.c: refactor `find_reference_location()`
309
+ - refs: plumb `exclude_patterns` argument throughout
310
+ - builtin/for-each-ref.c: add `--exclude` option
311
+ - ref-filter.c: parameterize match functions over patterns
312
+ - ref-filter: add `ref_filter_clear()`
313
+ - ref-filter: clear reachable list pointers after freeing
314
+ - ref-filter.h: provide `REF_FILTER_INIT`
315
+ - refs.c: rename `ref_filter`
316
+
317
+ Enumerating refs in the packed-refs file, while excluding refs that
318
+ match certain patterns, has been optimized.
319
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()`
320
+ Will merge to 'next'?
321
+ source: <cover.1684178576.git.me@ttaylorr.com>
322
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>
323
+
324
+* zh/ls-files-format-atoms (2023-05-14) 2 commits
325
+ - ls-files: add %(objectsize) atom to format option
326
+ - ls-files: add %(objecttype) atom to format option
327
+
328
+ Some atoms that can be used in "--format=<format>" for "git ls-tree"
329
+ were not supported by "git ls-files", even though they were relevant
330
+ in the context of the latter.
331
+ source: <pull.1533.git.1683969100.gitgitgadget@gmail.com>
332
+
333
+
334
+* jc/do-not-negate-test-helpers (2023-05-16) 3 commits
335
+ - test: do not negate test_path_is_* to assert absense
336
+ - t2021: do not negate test_path_is_dir
337
+ - tests: do not negate test_path_exists
338
+
339
+ Small fixes.
340
+
341
+ Will merge to 'next'.
342
+ source: <20230516022646.648123-1-gitster@pobox.com>
343
+
344
+
345
+* tb/run-command-needs-alloc-h (2023-05-16) 1 commit
346
+ (merged to 'next' on 2023-05-16 at b87f41e99e)
347
+ + run-command.c: fix missing include under `NO_PTHREADS`
348
+
349
+ Fix the build problem with NO_PTHREADS defined, a fallout from
350
+ recent header file shuffling.
351
+
352
+ Will merge to 'master'.
353
+ source: <ZGP2tw0USsj9oecZ@nand.local>
354
355
--------------------------------------------------
356
[Stalled]
@@ -356,17 +503,6 @@ Release tarballs are available at:
503
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
504
505
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
-
366
- Will merge to 'next'?
367
- source: <20230510190116.795641-2-toon@iotcl.com>
368
-
369
-
506
* cw/submodule-status-in-parallel (2023-03-02) 6 commits
507
- diff-lib: parallelize run_diff_files for submodules
508
- diff-lib: refactor out diff_change logic
@@ -386,29 +522,34 @@ Release tarballs are available at:
522
--------------------------------------------------
523
[Cooking]
524
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
525
+* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
526
+ - cat-file: quote-format name in error when using -z
527
393
- A test fix.
528
+ "cat-file" in the batch mode that is fed NUL-terminated pathnames
529
+ learned to cquote them in its error output (otherwise, a funny
530
+ pathname with LF in it would break the lines in the output stream).
531
395
- Will merge to 'master'.
396
- source: <xmqqild5rvvw.fsf@gitster.g>
532
+ Redesign.
533
+ source: <20230510190116.795641-2-toon@iotcl.com>
534
535
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
536
+* js/rebase-count-fixes (2023-05-14) 2 commits
537
+ - rebase -r: fix the total number shown in the progress
538
+ - rebase --update-refs: fix loops
539
403
- "git push --all" gained an alias "git push --branches".
540
+ A few bugs in the sequencer machinery that results in miscounting
541
+ the steps have been corrected.
542
405
- Will merge to 'master'.
406
- source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
543
+ Will merge to 'next'.
544
+ source: <pull.1531.v2.git.1683965487.gitgitgadget@gmail.com>
545
546
409
-* en/header-split-cache-h-part-3 (2023-05-08) 25 commits
547
+* en/header-split-cache-h-part-3 (2023-05-16) 29 commits
548
- fsmonitor-ll.h: split this header out of fsmonitor.h
549
- hash-ll, hashmap: move oidhash() to hash-ll
550
+ - object-store-ll.h: split this header out of object-store.h
551
+ - khash: name the structs that khash declares
552
+ - merge-ll: rename from ll-merge
553
- git-compat-util.h: remove unneccessary include of wildmatch.h
554
- builtin.h: remove unneccessary includes
555
- list-objects-filter-options.h: remove unneccessary include
@@ -430,35 +571,12 @@ Release tarballs are available at:
571
- read-cache: move shared commit and ls-files code
572
- setup: adopt shared init-db & clone code
573
- init-db, clone: change unnecessary global into passed parameter
433
- - init-db: remove unnecessary global variable & document existing bug
574
+ - init-db: remove unnecessary global variable
575
+ - init-db: document existing bug with core.bare in template config
576
- Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
577
578
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>
579
+ source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
580
581
582
* la/doc-interpret-trailers (2023-05-11) 9 commits
@@ -479,16 +597,6 @@ Release tarballs are available at:
597
source: <pull.1506.v2.git.git.1683839975.gitgitgadget@gmail.com>
598
599
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'.
489
- source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
490
-
491
-
600
* cc/git-replay (2023-05-09) 16 commits
601
- SQUASH???
602
- replay: stop assuming replayed branches do not diverge
@@ -510,46 +618,30 @@ Release tarballs are available at:
618
source: <20230509175347.1714141-1-christian.couder@gmail.com>
619
620
513
-* jc/pack-ref-exclude-include (2023-05-11) 4 commits
621
+* jc/pack-ref-exclude-include (2023-05-12) 3 commits
622
- pack-refs: teach pack-refs --include option
515
- - revision: modify ref_exclusions to handle inclusions
623
- pack-refs: teach --exclude option to exclude refs from being packed
624
- docs: clarify git-pack-refs --all will pack all refs
625
626
"git pack-refs" learns "--include" and "--exclude" to tweak the ref
627
hierarchy to be packed using pattern matching.
628
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>
629
+ Will merge to 'next'?
630
+ source: <pull.1501.v4.git.git.1683927282.gitgitgadget@gmail.com>
631
632
538
-* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
539
- - builtin/pack-objects.c: introduce `pack.extraCruftTips`
633
+* tb/gc-recent-object-hook (2023-05-15) 2 commits
634
+ - gc: introduce `gc.recentObjectsHook`
635
+ - reachable.c: extract `obj_is_recent()`
636
637
"git pack-objects" learned to invoke a new hook program that
638
enumerates extra objects to be used as anchoring points to keep
639
otherwise unreachable objects in cruft packs.
544
-
545
- Under discussion
546
- cf. <20230505221921.GE3321533@coredump.intra.peff.net>
547
- source: <27a7f16aab35b5cac391d9831aadb0f2e2146313.1683151485.git.me@ttaylorr.com>
640
+ source: <cover.1684196634.git.me@ttaylorr.com>
641
642
643
* jc/diff-s-with-other-options (2023-05-05) 1 commit
644
- diff: fix interaction between the "-s" option and other options
552
- (this branch uses jc/dirstat-plug-leaks.)
645
646
The "-s" (silent, squelch) option of the "diff" family of commands
647
did not interact with other options that specify the output format
@@ -560,63 +652,6 @@ Release tarballs are available at:
652
source: <20230505165952.335256-1-gitster@pobox.com>
653
654
563
-* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
564
- - doc: manpage: remove ancient workaround
565
- - doc: git-svn: use listing instead of verse
566
-
567
- Documentation toolchain lost an ancient workaround that is no
568
- longer needed.
569
-
570
- Needs review.
571
- source: <20230504035517.329765-1-felipe.contreras@gmail.com>
572
-
573
-
574
-* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
575
- - doc: revisions: add a bunch of missing quotes
576
- - doc: revisions: fix missing escape
577
-
578
- Doc cleanup.
579
-
580
- Needs review.
581
- source: <20230504163421.100400-1-felipe.contreras@gmail.com>
582
-
583
-
584
-* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
585
- (merged to 'next' on 2023-05-06 at 1eda43b03f)
586
- + doc-diff: drop SOURCE_DATE_EPOCH override
587
- + doc: doc-diff: specify date
588
-
589
- An earlier change broke "doc-diff", which has been corrected.
590
-
591
- Will merge to 'master'.
592
- source: <20230503232349.59997-1-felipe.contreras@gmail.com>
593
- source: <20230505211610.GA3197168@coredump.intra.peff.net>
594
-
595
-
596
-* jc/dirstat-plug-leaks (2023-05-05) 2 commits
597
- (merged to 'next' on 2023-05-09 at 2df7cf06e4)
598
- + diff: plug leaks in dirstat
599
- + diff: refactor common tail part of dirstat computation
600
- (this branch is used by jc/diff-s-with-other-options.)
601
-
602
- "git diff --dirstat" leaked memory, which has been plugged.
603
-
604
- Will merge to 'master'.
605
- source: <20230505211917.2746751-1-gitster@pobox.com>
606
-
607
-
608
-* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
609
- (merged to 'next' on 2023-05-09 at 0db4f08e32)
610
- + name-rev: make --stdin hidden
611
-
612
- The "--stdin" option of "git name-rev" has been replaced with
613
- the "--annotate-stdin" option more than a year ago. We stop
614
- advertising it in the "git name-rev -h" output.
615
-
616
- Will merge to 'master'.
617
- source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
618
-
619
-
655
* ob/revert-of-revert (2023-05-05) 1 commit
656
- sequencer: beautify subject of reverts of reverts
657
@@ -640,19 +675,6 @@ Release tarballs are available at:
675
source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
676
677
643
-* mc/send-email-header-cmd (2023-05-01) 3 commits
644
- (merged to 'next' on 2023-05-06 at 04514468b6)
645
- + send-email: detect empty blank lines in command output
646
- + send-email: add --header-cmd, --no-header-cmd options
647
- + send-email: extract execute_cmd from recipients_cmd
648
-
649
- "git send-email" learned "--header-cmd=<cmd>" that can inject
650
- arbitrary e-mail header lines to the outgoing messages.
651
-
652
- Will merge to 'master'.
653
- source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
654
-
655
-
678
* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
679
- upload-pack: advertise capabilities when cloning empty repos
680
@@ -661,58 +683,21 @@ Release tarballs are available at:
683
source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
684
685
664
-* ds/fsck-bitmap (2023-05-02) 2 commits
665
- (merged to 'next' on 2023-05-09 at c2148408a2)
666
- + fsck: use local repository
667
- + fsck: verify checksums of all .bitmap files
668
-
669
- "git fsck" learned to detect bit-flip breakages in the reachability
670
- bitmap files.
671
-
672
- Will merge to 'master'.
673
- source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
674
-
675
-
676
-* gc/trace-bare-repo-setup (2023-05-01) 1 commit
677
- (merged to 'next' on 2023-05-06 at 72b977d2f9)
678
- + setup: trace bare repository setups
679
-
680
- The tracing mechanism learned to notice and report when
681
- auto-discovered bare repositories are being used, as allowing so
682
- without explicitly stating the user intends to do so (with setting
683
- GIT_DIR for example) can be used with social engineering as an
684
- attack vector.
685
-
686
- Will merge to 'master'.
687
- source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
688
-
689
-
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
694
- - object-name: move related functions to object-name
695
- - credential-store: move related functions to credential-store file
696
- - abspath: move related functions to abspath
697
- - strbuf: clarify API boundary
686
+* cw/strbuf-cleanup (2023-05-12) 7 commits
687
+ (merged to 'next' on 2023-05-15 at 31d08296f2)
688
+ + strbuf: remove global variable
689
+ + strbuf: clarify dependency
690
+ + path: move related function to path
691
+ + object-name: move related functions to object-name
692
+ + credential-store: move related functions to credential-store file
693
+ + abspath: move related functions to abspath
694
+ + strbuf: clarify API boundary
695
696
Move functions that are not about pure string manipulation out of
697
strbuf.[ch]
698
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
707
- (merged to 'next' on 2023-05-06 at 7bae4db4cc)
708
- + doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
709
-
710
- The documentation was misleading about the interaction between
711
- GIT_DEFAULT_HASH and "git clone", which has been clarified to
712
- stress that the variable is to be ignored by the command.
713
-
699
Will merge to 'master'.
715
- source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
700
+ source: <20230512171429.2202982-1-calvinwan@google.com>
701
702
703
* tl/notes-separator (2023-04-28) 6 commits
@@ -769,45 +754,6 @@ Release tarballs are available at:
754
source: <cover.1683567065.git.me@ttaylorr.com>
755
756
772
-* ar/config-count-tests-updates (2023-04-24) 3 commits
773
- (merged to 'next' on 2023-05-06 at c585a56132)
774
- + t1300: add tests for missing keys
775
- + t1300: check stderr for "ignores pairs" tests
776
- + t1300: drop duplicate test
777
-
778
- Test updates.
779
-
780
- Will merge to 'master'.
781
- source: <20230423134649.431783-1-rybak.a.v@gmail.com>
782
-
783
-
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
787
- - fetch: lift up parsing of "fetch.output" config variable
788
- - fetch: introduce `display_format` enum
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
794
-
795
- "git fetch" learned the "--porcelain" option that emits what it did
796
- in a machine-parseable format.
797
-
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.
806
-
807
- Will merge to 'next'.
808
- source: <20230420205350.600760-1-szeder.dev@gmail.com>
809
-
810
-
757
* gc/doc-cocci-updates (2023-04-27) 2 commits
758
- cocci: codify authoring and reviewing practices
759
- cocci: add headings to and reword README
@@ -818,19 +764,6 @@ Release tarballs are available at:
764
source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
765
766
821
-* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
822
- (merged to 'next' on 2023-05-06 at 4e9a640131)
823
- + doc: interpret-trailers: fix example
824
- + doc: interpret-trailers: don’t use deprecated config
825
- + doc: interpret-trailers: use input redirection
826
- + doc: interpret-trailers: don’t use heredoc in examples
827
-
828
- Doc update.
829
-
830
- Will merge to 'master'.
831
- source: <cover.1682970213.git.code@khaugsbakk.name>
832
-
833
-
767
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
768
(merged to 'next' on 2023-04-20 at 2728a01622)
769
+ completion: complete AUTO_MERGE
@@ -854,35 +787,11 @@ Release tarballs are available at:
787
The libsecret credential helper learns to handle the password
788
expiry time information.
789
857
- Will merge to 'master'.
790
+ On hold.
791
+ The database gets littered with entries whose expiration dates only differ.
792
+ cf. <CAGJzqskMwOJkriH6serqdwAVYi+fftEL8ohJd-suP6v+OxB_bg@mail.gmail.com>
793
source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
794
860
-
861
-* sl/diff-files-sparse (2023-05-09) 2 commits
862
- - diff-files: integrate with sparse index
863
- - t1092: add tests for `git diff-files`
864
-
865
- Teach "diff-files" not to expand sparse-index unless needed.
866
-
867
- Will merge to 'next'.
868
- cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com>
869
- source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
870
-
871
-
872
-* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
873
- (merged to 'next' on 2023-05-06 at c61e9b0672)
874
- + branch: avoid unnecessary worktrees traversals
875
- + branch: rename orphan branches in any worktree
876
- + branch: description for orphan branch errors
877
- + branch: use get_worktrees() in copy_or_rename_branch()
878
- + branch: test for failures while renaming branches
879
-
880
- Error messages given when working on an unborn branch that is
881
- checked out in another worktree have been improved.
882
-
883
- Will merge to 'master'.
884
- source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
885
-
795
--------------------------------------------------
796
[Discarded]
797
@@ -937,3 +846,24 @@ Release tarballs are available at:
846
Breaks CI.
847
cf. <xmqqpm9bosjw.fsf@gitster.g>
848
source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
849
+
850
+
851
+* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
852
+ . doc: manpage: remove ancient workaround
853
+ . doc: git-svn: use listing instead of verse
854
+
855
+ Documentation toolchain lost an ancient workaround that is no
856
+ longer needed.
857
+
858
+ The contributor is no longer with the project.
859
+ source: <20230504035517.329765-1-felipe.contreras@gmail.com>
860
+
861
+
862
+* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
863
+ . doc: revisions: add a bunch of missing quotes
864
+ . doc: revisions: fix missing escape
865
+
866
+ Doc cleanup.
867
+
868
+ The contributor is no longer with the project.
869
+ source: <20230504163421.100400-1-felipe.contreras@gmail.com>