What's cooking (2023/05 #06)
Junio C Hamano committed
May 19, 2023 at 15:01 UTC
7027219540e6a1d712470f7c5bfb467720ac2c2c
1 file changed
+213
-320
whats-cooking.txt
+213
-320
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2023, #05; Tue, 16)
3
-X-master-at: 0df2c180904f6b709766f9c24669a9d01543f915
4
-X-next-at: b87f41e99e62330abb8a140c6bb46d61a0bfd809
2
+Subject: What's cooking in git.git (May 2023, #06; Fri, 19)
3
+X-master-at: 9e49351c3060e1fa6e0d2de64505b7becf157f28
4
+X-next-at: 5a3d083765c8d12722317bbf4686ddbaa5521b92
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2023, #05; Tue, 16)
7
+What's cooking in git.git (May 2023, #06; Fri, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,8 +16,9 @@ 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.
19
+Git 2.41-rc1 has been tagged. Thanks for catching and fixing a few
20
+regressions that escaped to the 'master' front so quickly, everybody.
21
+
22
Starting next week, until early June, my availability may be
23
sporadic, but this time I won't be completely away from the keyboard
24
to require an interrim maintainer.
@@ -53,304 +54,165 @@ Release tarballs are available at:
54
--------------------------------------------------
55
[Graduated to 'master']
56
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
-
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
-
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
85
- (merged to 'next' on 2023-05-11 at e0dab53028)
86
- + merge-tree: load default git config
87
-
88
- Allow git forges to disable replace-refs feature while running "git
89
- merge-tree".
90
- source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com>
91
-
92
-
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
-
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
-
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
-
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
-
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
-
121
- "git diff --dirstat" leaked memory, which has been plugged.
122
- source: <20230505211917.2746751-1-gitster@pobox.com>
123
-
124
-
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
-
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
-
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
-
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
-
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
57
+* bc/clone-empty-repo-via-protocol-v0 (2023-05-17) 1 commit
58
+ (merged to 'next' on 2023-05-17 at d320de7ee9)
59
+ + upload-pack: advertise capabilities when cloning empty repos
60
149
- A test fix.
150
- source: <xmqqild5rvvw.fsf@gitster.g>
61
+ The server side of "git clone" now advertises the necessary hints
62
+ to clients to help them to clone from an empty repository and learn
63
+ object hash algorithm and the (unborn) branch pointed at by HEAD,
64
+ even over the older v0/v1 protocol.
65
+ source: <20230517192443.1149190-2-sandals@crustytoothpaste.net>
66
67
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
-
159
- Retire "verbose" helper function from the test framework.
160
- source: <20230508185953.GA2108869@coredump.intra.peff.net>
161
-
162
-
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
-
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
-
177
- "git subtree" (in contrib/) update.
178
- source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
179
-
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
68
+* cg/doc-http-lowspeed-limit (2023-05-14) 1 commit
69
+ (merged to 'next' on 2023-05-19 at 5b48044bf5)
70
+ + doc/git-config: add unit for http.lowSpeedLimit
71
72
Doc update.
189
- source: <cover.1682970213.git.code@khaugsbakk.name>
73
+ source: <pull.1507.git.git.1683970203084.gitgitgadget@gmail.com>
74
75
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
76
+* jc/attr-source-tree (2023-05-06) 1 commit
77
+ (merged to 'next' on 2023-05-10 at cb94f4fba6)
78
+ + attr: teach "--attr-source=<tree>" global option to "git"
79
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>
80
+ "git --attr-source=<tree> cmd $args" is a new way to have any
81
+ command to read attributes not from the working tree but from the
82
+ given tree object.
83
+ source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
84
85
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
86
+* jc/do-not-negate-test-helpers (2023-05-16) 3 commits
87
+ (merged to 'next' on 2023-05-19 at 9c0221a2db)
88
+ + test: do not negate test_path_is_* to assert absense
89
+ + t2021: do not negate test_path_is_dir
90
+ + tests: do not negate test_path_exists
91
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>
92
+ Small fixes.
93
+ source: <20230516022646.648123-1-gitster@pobox.com>
94
95
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
96
+* jc/send-email-pre-process-fix (2023-05-17) 2 commits
97
+ (merged to 'next' on 2023-05-18 at 38a2de93b3)
98
+ + t9001: mark the script as no longer leak checker clean
99
+ (merged to 'next' on 2023-05-17 at fa1900a383)
100
+ + send-email: clear the $message_id after validation
101
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>
102
+ When "git send-email" that uses the validate hook is fed a message
103
+ without and then with Message-ID, it failed to auto-assign a unique
104
+ Message-ID to the former and instead reused the Message-ID from the
105
+ latter, which has been corrected. This was a fix for a recent
106
+ regression caught before the release, so no need to mention it in
107
+ the release notes.
108
+ source: <xmqqzg62oe9c.fsf@gitster.g>
109
110
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'
111
+* jk/http-test-cgipassauth-unavailable-in-older-apache (2023-05-18) 1 commit
112
+ (merged to 'next' on 2023-05-18 at 3f132b7071)
113
+ + t/lib-httpd: make CGIPassAuth support conditional
114
237
- Retire a rather expensive-to-run Coccinelle check patch.
238
- source: <20230420205350.600760-1-szeder.dev@gmail.com>
115
+ We started unconditionally testing with CGIPassAuth directive but
116
+ it is unavailable in older Apache that ships with CentOS 7 that has
117
+ about a year of shelf-life still left. The test has conditionally
118
+ been disabled when running with an ancient Apache. This was a fix
119
+ for a recent regression caught before the release, so no need to
120
+ mention it in the release notes.
121
+ source: <20230518192102.GA1514485@coredump.intra.peff.net>
122
123
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`
124
+* js/rebase-count-fixes (2023-05-14) 2 commits
125
+ (merged to 'next' on 2023-05-19 at 6503a9a17b)
126
+ + rebase -r: fix the total number shown in the progress
127
+ + rebase --update-refs: fix loops
128
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>
129
+ A few bugs in the sequencer machinery that results in miscounting
130
+ the steps have been corrected.
131
+ source: <pull.1531.v2.git.1683965487.gitgitgadget@gmail.com>
132
133
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
134
+* tb/run-command-needs-alloc-h (2023-05-16) 1 commit
135
+ (merged to 'next' on 2023-05-16 at b87f41e99e)
136
+ + run-command.c: fix missing include under `NO_PTHREADS`
137
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>
138
+ Fix the build problem with NO_PTHREADS defined, a fallout from
139
+ recent header file shuffling.
140
+ source: <ZGP2tw0USsj9oecZ@nand.local>
141
142
--------------------------------------------------
143
[New Topics]
144
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
-
272
-
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
-
281
- Will merge to 'next'.
282
- source: <cover.1684258780.git.code@khaugsbakk.name>
145
+* mh/credential-libsecret-attrs (2023-05-17) 1 commit
146
+ - credential/libsecret: store new attributes
147
148
+ The way authentication related data other than passwords (e.g.
149
+ oath token and password expiration data) are stored in libsecret
150
+ keyrings has been rethought.
151
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
152
+ Needs review.
153
+ source: <pull.1469.v4.git.git.1684306540947.gitgitgadget@gmail.com>
154
293
- Doc update.
294
-
295
- Expecting a minor and hopefully final reroll.
296
- source: <pull.1471.v3.git.git.1684152793.gitgitgadget@gmail.com>
155
156
+* ps/fetch-cleanups (2023-05-17) 9 commits
157
+ - fetch: use `fetch_config` to store "submodule.fetchJobs" value
158
+ - fetch: use `fetch_config` to store "fetch.parallel" value
159
+ - fetch: use `fetch_config` to store "fetch.recurseSubmodules" value
160
+ - fetch: use `fetch_config` to store "fetch.showForcedUpdates" value
161
+ - fetch: use `fetch_config` to store "fetch.pruneTags" value
162
+ - fetch: use `fetch_config` to store "fetch.prune" value
163
+ - fetch: pass through `fetch_config` directly
164
+ - fetch: drop unneeded NULL-check for `remote_ref`
165
+ - fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value
166
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`
167
+ Code clean-up.
168
317
- Enumerating refs in the packed-refs file, while excluding refs that
318
- match certain patterns, has been optimized.
169
+ Needs review.
170
+ source: <cover.1684324059.git.ps@pks.im>
171
320
- Will merge to 'next'?
321
- source: <cover.1684178576.git.me@ttaylorr.com>
172
173
+* sl/diff-tree-sparse (2023-05-18) 1 commit
174
+ - diff-tree: integrate with sparse index
175
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
176
+ "git diff-tree" has been taught to take advantage of the
177
+ sparse-index feature.
178
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>
179
+ Comments?
180
+ source: <20230518154454.475487-1-cheskaqiqi@gmail.com>
181
182
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
183
+* jk/format-patch-message-id-unleak (2023-05-19) 2 commits
184
+ - format-patch: free elements of rev.ref_message_ids list
185
+ - format-patch: free rev.message_id when exiting
186
339
- Small fixes.
187
+ Leakfix.
188
189
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>
190
+ source: <20230519000239.GA1975039@coredump.intra.peff.net>
191
+
192
+
193
+* jc/test-modernization (2023-05-19) 20 commits
194
+ - t7101-reset-empty-subdirs: modernize test format
195
+ - t6050-replace: modernize test format
196
+ - t5306-pack-nobase: modernize test format
197
+ - t5303-pack-corruption-resilience: modernize test format
198
+ - t5301-sliding-window: modernize test format
199
+ - t5300-pack-object: modernize test format
200
+ - t4206-log-follow-harder-copies: modernize test format
201
+ - t4202-log: modernize test format
202
+ - t4004-diff-rename-symlink: modernize test format
203
+ - t4003-diff-rename-1: modernize test format
204
+ - t4002-diff-basic: modernize test format
205
+ - t3903-stash: modernize test format
206
+ - t3700-add: modernize test format
207
+ - t3500-cherry: modernize test format
208
+ - t1006-cat-file: modernize test format
209
+ - t1002-read-tree-m-u-2way: modernize test format
210
+ - t1001-read-tree-m-2way: modernize test format
211
+ - t3210-pack-refs: modernize test format
212
+ - t0030-stripspace: modernize test format
213
+ - t0000-basic: modernize test format
214
+
215
+ source: <pull.1513.git.git.1684440205.gitgitgadget@gmail.com>
216
217
--------------------------------------------------
218
[Stalled]
@@ -377,24 +239,6 @@ Release tarballs are available at:
239
source: <20230408112342.404318-1-nanth.raghul@gmail.com>
240
241
380
-* ja/worktree-orphan (2023-04-17) 8 commits
381
- - worktree add: emit warn when there is a bad HEAD
382
- - worktree add: extend DWIM to infer --orphan
383
- - worktree add: introduce "try --orphan" hint
384
- - worktree add: add --orphan flag
385
- - t2400: add tests to verify --quiet
386
- - t2400: refactor "worktree add" opt exclusion tests
387
- - t2400: print captured git output when finished
388
- - worktree add: include -B in usage docs
389
-
390
- 'git worktree add' learned how to create a worktree based on an
391
- orphaned branch with `--orphan`.
392
-
393
- Expecting a reroll.
394
- cf. <m7crhly2j3k76whydbtdwhvzghvoql436g3lqtst4v3ahv75aa@wq5zjepgrxz5>
395
- source: <20230417093255.31079-1-jacobabel@nullpo.dev>
396
-
397
-
242
* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
243
- usage: clarify --recurse-submodules as a boolean
244
@@ -522,6 +366,84 @@ Release tarballs are available at:
366
--------------------------------------------------
367
[Cooking]
368
369
+* ja/worktree-orphan (2023-05-17) 8 commits
370
+ - worktree add: emit warn when there is a bad HEAD
371
+ - worktree add: extend DWIM to infer --orphan
372
+ - worktree add: introduce "try --orphan" hint
373
+ - worktree add: add --orphan flag
374
+ - t2400: add tests to verify --quiet
375
+ - t2400: refactor "worktree add" opt exclusion tests
376
+ - t2400: cleanup created worktree in test
377
+ - worktree add: include -B in usage docs
378
+
379
+ 'git worktree add' learned how to create a worktree based on an
380
+ orphaned branch with `--orphan`.
381
+ source: <20230517214711.12467-1-jacobabel@nullpo.dev>
382
+
383
+
384
+* kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits
385
+ (merged to 'next' on 2023-05-19 at fc0fe3173d)
386
+ + tag: keep the message file in case ref transaction fails
387
+ + t/t7004-tag: add regression test for successful tag creation
388
+ + doc: tag: document `TAG_EDITMSG`
389
+
390
+ "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the
391
+ command failed, so that the user can salvage what they typed.
392
+
393
+ Will cook in 'next'.
394
+ source: <cover.1684258780.git.code@khaugsbakk.name>
395
+
396
+
397
+* sa/doc-ls-remote (2023-05-19) 6 commits
398
+ (merged to 'next' on 2023-05-20 at d577bf75a0)
399
+ + ls-remote doc: document the output format
400
+ + ls-remote doc: explain what each example does
401
+ + ls-remote doc: show peeled tags in examples
402
+ + ls-remote doc: remove redundant --tags example
403
+ + show-branch doc: say <ref>, not <reference>
404
+ + show-ref doc: update for internal consistency
405
+
406
+ Doc update.
407
+
408
+ Will cook in 'next'.
409
+ source: <pull.1471.v4.git.git.1684469874.gitgitgadget@gmail.com>
410
+
411
+
412
+* tb/refs-exclusion-and-packed-refs (2023-05-15) 16 commits
413
+ - ls-refs.c: avoid enumerating hidden refs where possible
414
+ - upload-pack.c: avoid enumerating hidden refs where possible
415
+ - builtin/receive-pack.c: avoid enumerating hidden references
416
+ - refs.h: let `for_each_namespaced_ref()` take excluded patterns
417
+ - refs/packed-backend.c: ignore complicated hidden refs rules
418
+ - revision.h: store hidden refs in a `strvec`
419
+ - refs/packed-backend.c: add trace2 counters for jump list
420
+ - refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
421
+ - refs/packed-backend.c: refactor `find_reference_location()`
422
+ - refs: plumb `exclude_patterns` argument throughout
423
+ - builtin/for-each-ref.c: add `--exclude` option
424
+ - ref-filter.c: parameterize match functions over patterns
425
+ - ref-filter: add `ref_filter_clear()`
426
+ - ref-filter: clear reachable list pointers after freeing
427
+ - ref-filter.h: provide `REF_FILTER_INIT`
428
+ - refs.c: rename `ref_filter`
429
+
430
+ Enumerating refs in the packed-refs file, while excluding refs that
431
+ match certain patterns, has been optimized.
432
+
433
+ Will merge to 'next'?
434
+ source: <cover.1684178576.git.me@ttaylorr.com>
435
+
436
+
437
+* zh/ls-files-format-atoms (2023-05-14) 2 commits
438
+ - ls-files: add %(objectsize) atom to format option
439
+ - ls-files: add %(objecttype) atom to format option
440
+
441
+ Some atoms that can be used in "--format=<format>" for "git ls-tree"
442
+ were not supported by "git ls-files", even though they were relevant
443
+ in the context of the latter.
444
+ source: <pull.1533.git.1683969100.gitgitgadget@gmail.com>
445
+
446
+
447
* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
448
- cat-file: quote-format name in error when using -z
449
@@ -533,17 +455,6 @@ Release tarballs are available at:
455
source: <20230510190116.795641-2-toon@iotcl.com>
456
457
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
-
540
- A few bugs in the sequencer machinery that results in miscounting
541
- the steps have been corrected.
542
-
543
- Will merge to 'next'.
544
- source: <pull.1531.v2.git.1683965487.gitgitgadget@gmail.com>
545
-
546
-
458
* en/header-split-cache-h-part-3 (2023-05-16) 29 commits
459
- fsmonitor-ll.h: split this header out of fsmonitor.h
460
- hash-ll, hashmap: move oidhash() to hash-ll
@@ -626,7 +537,7 @@ Release tarballs are available at:
537
"git pack-refs" learns "--include" and "--exclude" to tweak the ref
538
hierarchy to be packed using pattern matching.
539
629
- Will merge to 'next'?
540
+ Will merge to 'next'.
541
source: <pull.1501.v4.git.git.1683927282.gitgitgadget@gmail.com>
542
543
@@ -641,14 +552,15 @@ Release tarballs are available at:
552
553
554
* jc/diff-s-with-other-options (2023-05-05) 1 commit
644
- - diff: fix interaction between the "-s" option and other options
555
+ (merged to 'next' on 2023-05-20 at dda3826a68)
556
+ + diff: fix interaction between the "-s" option and other options
557
558
The "-s" (silent, squelch) option of the "diff" family of commands
559
did not interact with other options that specify the output format
560
well. This has been cleaned up so that it will clear all the
561
formatting options given before.
562
651
- Will merge to 'next'?
563
+ Will cook in 'next'.
564
source: <20230505165952.335256-1-gitster@pobox.com>
565
566
@@ -663,26 +575,6 @@ Release tarballs are available at:
575
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
576
577
666
-* jc/attr-source-tree (2023-05-06) 1 commit
667
- (merged to 'next' on 2023-05-10 at cb94f4fba6)
668
- + attr: teach "--attr-source=<tree>" global option to "git"
669
-
670
- "git --attr-source=<tree> cmd $args" is a new way to have any
671
- command to read attributes not from the working tree but from the
672
- given tree object.
673
-
674
- Will merge to 'master'.
675
- source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
676
-
677
-
678
-* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
679
- - upload-pack: advertise capabilities when cloning empty repos
680
-
681
- Expecting a minor and hopefully final update.
682
- cf. <20230501224038.GA1174291@coredump.intra.peff.net>
683
- source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
684
-
685
-
578
* cw/strbuf-cleanup (2023-05-12) 7 commits
579
(merged to 'next' on 2023-05-15 at 31d08296f2)
580
+ strbuf: remove global variable
@@ -696,7 +588,7 @@ Release tarballs are available at:
588
Move functions that are not about pure string manipulation out of
589
strbuf.[ch]
590
699
- Will merge to 'master'.
591
+ Will cook in 'next'.
592
source: <20230512171429.2202982-1-calvinwan@google.com>
593
594
@@ -712,7 +604,7 @@ Release tarballs are available at:
604
'git notes append' was taught '--separator' to specify string to insert
605
between paragraphs.
606
715
- Will merge to 'master'.
607
+ On hold.
608
source: <cover.1682671758.git.dyroneteng@gmail.com>
609
610
@@ -738,7 +630,7 @@ Release tarballs are available at:
630
631
Fix-up to a topic already graduated to 'master'.
632
741
- Will merge to 'next'?
633
+ Will merge to 'next' and then to 'master'.
634
source: <20230508202140.464363-1-cheskaqiqi@gmail.com>
635
636
@@ -755,12 +647,13 @@ Release tarballs are available at:
647
648
649
* gc/doc-cocci-updates (2023-04-27) 2 commits
758
- - cocci: codify authoring and reviewing practices
759
- - cocci: add headings to and reword README
650
+ (merged to 'next' on 2023-05-20 at 3fe237c1a8)
651
+ + cocci: codify authoring and reviewing practices
652
+ + cocci: add headings to and reword README
653
654
Update documentation regarding Coccinelle patches.
655
763
- Will merge to 'next'?
656
+ Will cook in 'next'.
657
source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
658
659