What's cooking (2023/03 #02)
Junio C Hamano committed
Mar 7, 2023 at 13:41 UTC
08b117fedb3d3fef39c79b44095d16aa06caf399
1 file changed
+201
-278
whats-cooking.txt
+201
-278
@@ -1,21 +1,20 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2023, #01; Wed, 1)
3
-X-master-at: ef7d4f53c2fd9e8186d093dea6d45a91ce57110e
4
-X-next-at: e12885d4f5a6a5e9a900ddf12ad1635bcc81869b
2
+Subject: What's cooking in git.git (Mar 2023, #02; Tue, 7)
3
+X-master-at: 725f57037d81e24eacfda6e59a19c60c0b4c8062
4
+X-next-at: 97d40d926ee7422876456a84ac38bfc5edc7d9d1
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2023, #01; Wed, 1)
7
+What's cooking in git.git (Mar 2023, #02; Tue, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
11
prefixed with '+' are in 'next' (being in 'next' is a sign that a
12
topic is stable enough to be used and are candidate to be in a future
13
release). Commits prefixed with '-' are only in 'seen', and aren't
14
-considered "accepted" at all. A topic without enough support may be
15
-discarded after a long period of no activity.
16
-
17
-I just tagged Git 2.40-rc1; from here on, let's concentrate on
18
-finding and fixing regressions relative to Git 2.39.
14
+considered "accepted" at all and may be annotated with an URL to a
15
+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
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
@@ -48,276 +47,112 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[New Topics]
49
51
-* ak/restore-both-incompatible-with-conflicts (2023-02-27) 1 commit
52
- - restore: fault --staged --worktree with merge opts
50
+* as/doc-markup-fix (2023-03-06) 1 commit
51
+ - git-merge-tree.txt: replace spurious HTML entity
52
54
- "git restore" supports options like "--ours" that are only
55
- meaningful during a conflicted merge, but these options are only
56
- meaningful when updating the working tree files. These options are
57
- marked to be incompatible when both "--staged" and "--worktree" are
58
- in effect.
53
+ Fix for a mis-mark-up in doc made in Git 2.39 days.
54
60
- Comments?
61
- source: <20230226184354.221-1-andy.koppe@gmail.com>
55
+ Will merge to 'next'.
56
+ source: <87y1oco3i9.fsf@igel.home>
57
58
64
-* ew/fetch-hiderefs (2023-02-27) 1 commit
65
- (merged to 'next' on 2023-03-01 at 6a7eece733)
66
- + fetch: support hideRefs to speed up connectivity checks
59
+* ds/ahead-behind (2023-03-06) 8 commits
60
+ - ahead-behind: add --contains mode
61
+ - ahead-behind: implement ahead_behind() logic
62
+ - commit-graph: introduce `ensure_generations_valid()`
63
+ - commit-graph: return generation from memory
64
+ - commit-graph: combine generation computations
65
+ - ahead-behind: implement --ignore-missing option
66
+ - ahead-behind: parse tip references
67
+ - ahead-behind: create empty builtin
68
68
- A new "fetch.hideRefs" option can be used to exclude specified refs
69
- from "rev-list --objects --stdin --not --all" traversal for
70
- checking object connectivity, most useful when there are many
71
- unrelated histories in a single repository.
69
+ "git ahead-behind --base=<reference> --stdin" computes the
70
+ distances from a single reference point in the history with bunch
71
+ of commits in bulk.
72
73
- Will cook in 'next'.
74
- source: <20230212090426.M558990@dcvr>
73
+ Comments?
74
+ source: <pull.1489.git.1678111598.gitgitgadget@gmail.com>
75
76
77
-* zh/push-to-delete-onelevel-ref (2023-03-01) 2 commits
78
- - push: allow delete single-level ref
79
- - receive-pack: fix funny ref error messsage
77
+* gc/config-parsing-cleanup (2023-03-03) 6 commits
78
+ - config.c: remove current_parsing_scope
79
+ - config.c: remove current_config_kvi
80
+ - config.c: plumb the_reader through callbacks
81
+ - config.c: create config_reader and the_reader
82
+ - config.c: don't assign to "cf" directly
83
+ - config.c: plumb config_source through static fns
84
81
- "git push" has been taught to allow deletion of refs with one-level
82
- names to help repairing a repository who acquired such a ref by
83
- mistake. In general, we don't encourage use of such a ref, and
84
- creation or update to such a ref is rejected as before.
85
+ Config API clean-up to reduce its dependence on static variables
86
87
Comments?
87
- source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
88
-
88
+ source: <pull.1463.git.git.1677631097.gitgitgadget@gmail.com>
89
90
-* fz/rebase-msg-update (2023-02-27) 1 commit
91
- (merged to 'next' on 2023-03-01 at f28c0df111)
92
- + rebase: fix capitalisation autoSquash in i18n string
90
94
- Message update.
95
-
96
- Will cook in 'next'.
97
- source: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com>
91
+* jk/bundle-progress (2023-03-06) 1 commit
92
+ - bundle: turn on --all-progress-implied by default
93
94
+ Simplify UI to control progress meter given by "git bundle" command.
95
100
-* gm/signature-format-doc (2023-02-27) 1 commit
101
- (merged to 'next' on 2023-03-01 at 19f9ce8c40)
102
- + signature-format.txt: note SSH and X.509 signature delimiters
96
+ Will merge to 'next'.
97
+ source: <ZAMjkffYmp+DNmr+@coredump.intra.peff.net>
98
104
- Doc update.
99
106
- Will cook in 'next'.
107
- source: <20230227202718.173698-1-gwymor@tilde.club>
100
+* jk/bundle-use-dash-for-stdfiles (2023-03-06) 5 commits
101
+ - parse-options: use prefix_filename_except_for_dash() helper
102
+ - parse-options: consistently allocate memory in fix_filename()
103
+ - bundle: don't blindly apply prefix_filename() to "-"
104
+ - bundle: document handling of "-" as stdin
105
+ - bundle: let "-" mean stdin for reading operations
106
107
+ "git bundle" learned that "-" is a common way to say that the input
108
+ comes from the standard input and/or the output goes to the
109
+ standard output. It used to work only for output and only from the
110
+ root level of the working tree.
111
110
-* my/wildmatch-cleanups (2023-02-27) 5 commits
111
- - wildmatch: more cleanups after killing uchar
112
- - wildmatch: use char instead of uchar
113
- - wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
114
- - wildmatch: remove IS*() macros
115
- - git-compat-util: add isblank() and isgraph()
112
+ Will merge to 'next'.
113
+ source: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
114
117
- Code clean-up.
115
119
- Comments?
120
- source: <20230226115021.1681834-1-masahiroy@kernel.org>
116
+* jk/format-patch-change-format-for-empty-commits (2023-03-03) 1 commit
117
+ - format-patch: output header for empty commits
118
119
+ "git format-patch" learned to write a log-message only output file
120
+ for empty commits.
121
123
-* rs/range-diff-custom-abbrev-fix (2023-02-28) 1 commit
124
- (merged to 'next' on 2023-02-28 at 82f1929a15)
125
- + range-diff: avoid compiler warning when char is unsigned
126
-
127
- Hotfix for a topic that is already in 'master'.
128
-
129
- Will merge to 'master'.
130
- source: <1156586e-9dbe-335e-7e33-74eea7913e86@web.de>
122
+ Will merge to 'next'.
123
+ source: <20230303160301.3659328-1-john@keeping.me.uk>
124
125
133
-* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits
134
- . add: reject nested repositories
135
- . tests: remove duplicate .gitmodules path
136
- . tests: use `git submodule add` and fix expected status
137
- . tests: use `git submodule add` and fix expected diffs
138
- . tests: Use `git submodule add` instead of `git add`
139
- . t4041, t4060: modernize test style
126
+* ds/reprepare-alternates-when-repreparing-packfiles (2023-03-06) 1 commit
127
+ - object-file: reprepare alternates when necessary
128
141
- Forbid "git add dir" from adding a gitlink to the index.
129
+ Once we start running, we assumed that the list of alternate object
130
+ databases would never change. Hook into the machinery used to
131
+ update the list of packfiles during runtime to update this list as
132
+ well.
133
134
Comments?
144
- Seems to break tests when merged to 'seen'.
145
- source: <20230228185253.2356546-1-calvinwan@google.com>
135
+ source: <pull.1490.git.1678136369387.gitgitgadget@gmail.com>
136
137
--------------------------------------------------
138
[Graduated to 'master']
139
150
-* ap/t2015-style-update (2023-02-21) 1 commit
151
- (merged to 'next' on 2023-02-22 at 40883b85c7)
152
- + t2015-checkout-unborn.sh: changes the style for cd
153
-
154
- Test clean-up.
155
- source: <20230218192128.7963-1-ashutosh.pandeyhlr007@gmail.com>
156
-
157
-
158
-* ar/test-lib-remove-stale-comment (2023-02-27) 1 commit
159
- (merged to 'next' on 2023-02-27 at d948667d2d)
160
- + test-lib: drop comment about test_description
161
-
162
- Test library clean-up.
163
- source: <20230226105303.55033-1-rybak.a.v@gmail.com>
164
-
165
-
166
-* if/simplify-trace-setup (2023-02-21) 1 commit
167
- (merged to 'next' on 2023-02-24 at 9c8e690f3d)
168
- + trace.c, git.c: remove unnecessary parameter to trace_repo_setup()
169
-
170
- Code clean-up.
171
- source: <20230219002527.84315-1-mcsm224@gmail.com>
172
-
173
-
174
-* jc/countermand-format-attach (2023-02-17) 1 commit
175
- (merged to 'next' on 2023-02-24 at 709ed91a7c)
176
- + format.attach: allow empty value to disable multi-part messages
177
-
178
- The format.attach configuration variable lacked a way to override a
179
- value defined in a lower-priority configuration file (e.g. the
180
- system one) by redefining it in a higher-priority configuration
181
- file. Now, setting format.attach to an empty string means show the
182
- patch inline in the e-mail message, without using MIME attachment.
183
-
184
- This is a backward incompatible change.
185
- source: <xmqqwn4fkgtq.fsf@gitster.g>
186
-
187
-
188
-* jc/diff-algo-attribute (2023-02-21) 2 commits
189
- (merged to 'next' on 2023-02-22 at 2375640330)
190
- + diff: teach diff to read algorithm from diff driver
191
- + diff: consolidate diff algorithm option parsing
192
-
193
- The "diff" drivers specified by the "diff" attribute attached to
194
- paths can now specify which algorithm (e.g. histogram) to use.
195
- source: <pull.1452.v4.git.git.1676927082.gitgitgadget@gmail.com>
196
-
197
-
198
-* jk/http-proxy-tests (2023-02-16) 1 commit
199
- (merged to 'next' on 2023-02-22 at f1f69d188f)
200
- + add basic http proxy tests
201
-
202
- Test updates.
203
- source: <Y+6YgALh6L9m6rSX@coredump.intra.peff.net>
204
-
205
-
206
-* jk/http-test-fixes (2023-02-23) 16 commits
207
- (merged to 'next' on 2023-02-24 at 8f3d70acc4)
208
- + t5559: make SSL/TLS the default
209
- + t5559: fix test failures with LIB_HTTPD_SSL
210
- + t/lib-httpd: enable HTTP/2 "h2" protocol, not just h2c
211
- + t/lib-httpd: respect $HTTPD_PROTO in expect_askpass()
212
- + t5551: drop curl trace lines without headers
213
- + t5551: handle v2 protocol in cookie test
214
- + t5551: simplify expected cookie file
215
- + t5551: handle v2 protocol in upload-pack service test
216
- + t5551: handle v2 protocol when checking curl trace
217
- + t5551: stop forcing clone to run with v0 protocol
218
- + t5551: handle HTTP/2 when checking curl trace
219
- + t5551: lower-case headers in expected curl trace
220
- + t5551: drop redundant grep for Accept-Language
221
- + t5541: simplify and move "no empty path components" test
222
- + t5541: stop marking "used receive-pack service" test as v0 only
223
- + t5541: run "used receive-pack service" test earlier
224
-
225
- Various fix-ups on HTTP tests.
226
- source: <Y/dEYYWKy/o96vBG@coredump.intra.peff.net>
227
-
228
-
229
-* jk/shorten-unambiguous-ref-wo-sscanf (2023-02-15) 3 commits
230
- (merged to 'next' on 2023-02-24 at 12ca5684f0)
231
- + shorten_unambiguous_ref(): avoid sscanf()
232
- + shorten_unambiguous_ref(): use NUM_REV_PARSE_RULES constant
233
- + shorten_unambiguous_ref(): avoid integer truncation
234
-
235
- sscanf(3) used in "git symbolic-ref --short" implementation found
236
- to be not working reliably on macOS in UTF-8 locales. Rewrite the
237
- code to avoid sscanf() altogether to work it around.
238
- source: <Y+z3MtgayoXsxaHA@coredump.intra.peff.net>
239
-
240
-
241
-* ma/fetch-parallel-use-online-cpus (2023-02-21) 1 commit
242
- (merged to 'next' on 2023-02-22 at 756d379bf0)
243
- + fetch: choose a sensible default with --jobs=0 again
244
-
245
- "git fetch --jobs=0" used to hit a BUG(), which has been corrected
246
- to use the available CPUs.
247
- source: <pull.1483.git.1676928805555.gitgitgadget@gmail.com>
248
-
249
-
250
-* mh/credential-password-expiry (2023-02-22) 1 commit
251
- (merged to 'next' on 2023-02-24 at dbff7db22a)
252
- + credential: new attribute password_expiry_utc
253
-
254
- The credential subsystem learned that a password may have an
255
- explicit expiration.
256
- source: <pull.1443.v4.git.git.1676701977347.gitgitgadget@gmail.com>
257
-
258
-
259
-* ps/free-island-marks (2023-02-21) 1 commit
260
- (merged to 'next' on 2023-02-22 at f46938bce3)
261
- + delta-islands: fix segfault when freeing island marks
262
-
263
- Fix on a previous fix already in 'master'.
264
- source: <61e490595b80b34c55fd640e093e021ff6fa9591.1676542973.git.ps@pks.im>
265
-
266
-
267
-* pw/rebase-i-parse-fix (2023-02-23) 2 commits
268
- (merged to 'next' on 2023-02-24 at 5a2a2569eb)
269
- + rebase -i: fix parsing of "fixup -C<commit>"
270
- + rebase -i: match whole word in is_command()
271
-
272
- Fixes to code that parses the todo file used in "rebase -i".
273
- source: <pull.1486.git.1677185701.gitgitgadget@gmail.com>
274
-
275
-
276
-* pw/rebase-i-validate-labels-early (2023-02-21) 1 commit
277
- (merged to 'next' on 2023-02-22 at 9b37d42d24)
278
- + rebase -i: check labels and refs when parsing todo list
279
-
280
- An invalid label or ref in the "rebase -i" todo file used to
281
- trigger an runtime error. SUch an error is now diagnosed while the
282
- todo file is parsed.
283
- source: <pull.1482.v2.git.1676902774366.gitgitgadget@gmail.com>
284
-
285
-
286
-* rs/archive-mtime (2023-02-18) 1 commit
287
- (merged to 'next' on 2023-02-24 at 34869696a2)
288
- + archive: add --mtime
289
-
290
- "git archive HEAD^{tree}" records the paths with the current
291
- timestamp in the archive, making it harder to obtain a stable
292
- output. The command learned the --mtime option to specify an
293
- arbitrary timestamp (e.g. --mtime="@0 +0000" for the epoch).
294
- source: <91a73f5d-ca3e-6cb0-4ba3-38d703074ee6@web.de>
295
-
296
-
297
-* tb/drop-dir-iterator-follow-symlink-bit (2023-02-16) 2 commits
298
- (merged to 'next' on 2023-02-22 at 785e1f323e)
299
- + t0066: drop setup of "dir5"
300
- + dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS`
301
-
302
- Remove leftover and unused code.
303
- source: <9bb10b607e46f867a3f8f5c71abf13c990d1ecfe.1676572031.git.me@ttaylorr.com>
304
- source: <CAGdrTFhHBU2BNYdYr7LbOS7i1LOHGjWLw_d5ZJAXxvTKyLiFCA@mail.gmail.com>
305
-
140
+* gm/signature-format-doc (2023-02-27) 1 commit
141
+ (merged to 'next' on 2023-03-01 at 19f9ce8c40)
142
+ + signature-format.txt: note SSH and X.509 signature delimiters
143
307
-* tl/range-diff-custom-abbrev (2023-02-21) 1 commit
308
- (merged to 'next' on 2023-02-22 at 49db7cce13)
309
- + range-diff: let '--abbrev' option takes effect
144
+ Doc update.
145
311
- "git range-diff" learned --abbrev=<num> option.
312
- source: <20230220142444.18739-2-tenglong.tl@alibaba-inc.com>
146
+ Will cook in 'next'.
147
+ source: <20230227202718.173698-1-gwymor@tilde.club>
148
149
315
-* zy/t9700-style (2023-02-25) 1 commit
316
- (merged to 'next' on 2023-02-27 at 6c52b8ebb2)
317
- + t9700: modernize test scripts
150
+* rs/range-diff-custom-abbrev-fix (2023-02-28) 1 commit
151
+ (merged to 'next' on 2023-02-28 at 82f1929a15)
152
+ + range-diff: avoid compiler warning when char is unsigned
153
319
- Test style fixes.
320
- source: <20230225013003.1971931-1-18994118902@163.com>
154
+ Hotfix for a topic that is already in 'master'.
155
+ source: <1156586e-9dbe-335e-7e33-74eea7913e86@web.de>
156
157
--------------------------------------------------
158
[Stalled]
@@ -413,7 +248,86 @@ Release tarballs are available at:
248
--------------------------------------------------
249
[Cooking]
250
416
-* ah/rebase-merges-config (2023-02-25) 3 commits
251
+* ak/restore-both-incompatible-with-conflicts (2023-02-27) 1 commit
252
+ (merged to 'next' on 2023-03-06 at 4ee341853c)
253
+ + restore: fault --staged --worktree with merge opts
254
+
255
+ "git restore" supports options like "--ours" that are only
256
+ meaningful during a conflicted merge, but these options are only
257
+ meaningful when updating the working tree files. These options are
258
+ marked to be incompatible when both "--staged" and "--worktree" are
259
+ in effect.
260
+
261
+ Will cook in 'next'.
262
+ source: <20230226184354.221-1-andy.koppe@gmail.com>
263
+
264
+
265
+* ew/fetch-hiderefs (2023-02-27) 1 commit
266
+ (merged to 'next' on 2023-03-01 at 6a7eece733)
267
+ + fetch: support hideRefs to speed up connectivity checks
268
+
269
+ A new "fetch.hideRefs" option can be used to exclude specified refs
270
+ from "rev-list --objects --stdin --not --all" traversal for
271
+ checking object connectivity, most useful when there are many
272
+ unrelated histories in a single repository.
273
+
274
+ Will cook in 'next'.
275
+ source: <20230212090426.M558990@dcvr>
276
+
277
+
278
+* zh/push-to-delete-onelevel-ref (2023-03-01) 2 commits
279
+ (merged to 'next' on 2023-03-06 at f08def5949)
280
+ + push: allow delete single-level ref
281
+ + receive-pack: fix funny ref error messsage
282
+
283
+ "git push" has been taught to allow deletion of refs with one-level
284
+ names to help repairing a repository who acquired such a ref by
285
+ mistake. In general, we don't encourage use of such a ref, and
286
+ creation or update to such a ref is rejected as before.
287
+
288
+ Will cook in 'next'.
289
+ source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
290
+
291
+
292
+* fz/rebase-msg-update (2023-02-27) 1 commit
293
+ (merged to 'next' on 2023-03-01 at f28c0df111)
294
+ + rebase: fix capitalisation autoSquash in i18n string
295
+
296
+ Message update.
297
+
298
+ Will cook in 'next'.
299
+ source: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com>
300
+
301
+
302
+* my/wildmatch-cleanups (2023-02-27) 5 commits
303
+ - wildmatch: more cleanups after killing uchar
304
+ - wildmatch: use char instead of uchar
305
+ - wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
306
+ - wildmatch: remove IS*() macros
307
+ - git-compat-util: add isblank() and isgraph()
308
+
309
+ Code clean-up.
310
+
311
+ Comments?
312
+ source: <20230226115021.1681834-1-masahiroy@kernel.org>
313
+
314
+
315
+* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits
316
+ . add: reject nested repositories
317
+ . tests: remove duplicate .gitmodules path
318
+ . tests: use `git submodule add` and fix expected status
319
+ . tests: use `git submodule add` and fix expected diffs
320
+ . tests: Use `git submodule add` instead of `git add`
321
+ . t4041, t4060: modernize test style
322
+
323
+ Forbid "git add dir" from adding a gitlink to the index.
324
+
325
+ Comments?
326
+ Seems to break tests when merged to 'seen'.
327
+ source: <20230228185253.2356546-1-calvinwan@google.com>
328
+
329
+
330
+* ah/rebase-merges-config (2023-03-06) 3 commits
331
- rebase: add a config option for --rebase-merges
332
- rebase: deprecate --rebase-merges=""
333
- rebase: add documentation and test for --no-rebase-merges
@@ -423,7 +337,7 @@ Release tarballs are available at:
337
338
On hold.
339
cf. <b4be9cb3-c24b-4377-bab3-5d53035efdf8@gmx.de>
426
- source: <20230225180325.796624-1-alexhenrie24@gmail.com>
340
+ source: <20230305050709.68736-1-alexhenrie24@gmail.com>
341
342
343
* en/dir-api-cleanup (2023-02-27) 13 commits
@@ -521,9 +435,13 @@ Release tarballs are available at:
435
436
437
* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
524
- - commit-reach: avoid NULL dereference
438
+ (merged to 'next' on 2023-03-06 at 5dc1c4c0b7)
439
+ + commit-reach: avoid NULL dereference
440
526
- Under discussion.
441
+ Fix a segfaulting loop. The function and its caller may need
442
+ further clean-up.
443
+
444
+ Will cook in 'next'.
445
cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
446
source: <20230211111526.2028178-1-e@80x24.org>
447
@@ -569,28 +487,30 @@ Release tarballs are available at:
487
488
489
* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
572
- - tests: don't lose misc "git" exit codes
573
- - tests: don't lose exit status with "test <op> $(git ...)"
574
- - tests: don't lose "git" exit codes in "! ( git ... | grep )"
575
- - tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
576
- - t/lib-patch-mode.sh: fix ignored exit codes
577
- - auto-crlf tests: don't lose exit code in loops and outside tests
490
+ (merged to 'next' on 2023-03-06 at 60d7d0d493)
491
+ + tests: don't lose misc "git" exit codes
492
+ + tests: don't lose exit status with "test <op> $(git ...)"
493
+ + tests: don't lose "git" exit codes in "! ( git ... | grep )"
494
+ + tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
495
+ + t/lib-patch-mode.sh: fix ignored exit codes
496
+ + auto-crlf tests: don't lose exit code in loops and outside tests
497
498
Test clean-up.
499
581
- Will merge to 'next'.
500
+ Will cook in 'next'.
501
source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
502
503
504
* rj/branch-unborn-in-other-worktrees (2023-02-22) 3 commits
586
- - branch: rename orphan branches in any worktree
587
- - branch: description for orphan branch errors
588
- - branch: avoid unnecessary worktrees traversals
505
+ (merged to 'next' on 2023-03-06 at 6ee0ec72ae)
506
+ + branch: rename orphan branches in any worktree
507
+ + branch: description for orphan branch errors
508
+ + branch: avoid unnecessary worktrees traversals
509
510
Error messages given when working on an unborn branch that is
511
checked out in another worktree have been improvved.
512
593
- Comments?
513
+ Will cook in 'next'.
514
source: <139555f1-21ab-d987-a58e-c7f04ce222d3@gmail.com>
515
516
@@ -611,12 +531,11 @@ Release tarballs are available at:
531
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
532
533
614
-* ab/config-multi-and-nonbool (2023-02-07) 10 commits
534
+* ab/config-multi-and-nonbool (2023-03-07) 9 commits
535
- for-each-repo: with bad config, don't conflate <path> and <cmd>
536
- config API: add "string" version of *_value_multi(), fix segfaults
537
- config API users: test for *_get_value_multi() segfaults
538
- for-each-repo: error on bad --config
619
- - config API: don't lose the git_*get*() return values
539
- config API: have *_multi() return an "int" and take a "dest"
540
- versioncmp.c: refactor config reading next commit
541
- config API: add and use a "git_config_get()" family of functions
@@ -625,9 +544,8 @@ Release tarballs are available at:
544
545
Assorted config API updates.
546
628
- Drop [06/10] step before merging in?
629
- cf. <kl6lfsaw84vo.fsf@chooglen-macbookpro.roam.corp.google.com>
630
- source: <cover-v5-00.10-00000000000-20230207T154000Z-avarab@gmail.com>
547
+ Comments?
548
+ source: <cover-v6-0.9-00000000000-20230307T180516Z-avarab@gmail.com>
549
550
551
* cb/checkout-same-branch-twice (2023-01-20) 1 commit
@@ -642,25 +560,29 @@ Release tarballs are available at:
560
561
562
* rj/avoid-switching-to-already-used-branch (2023-02-25) 4 commits
645
- - switch: reject if the branch is already checked out elsewhere (test)
646
- - rebase: refuse to switch to a branch already checked out elsewhere (test)
647
- - branch: fix die_if_checked_out() when ignore_current_worktree
648
- - worktree: introduce is_shared_symref()
563
+ (merged to 'next' on 2023-03-06 at 7546231ddf)
564
+ + switch: reject if the branch is already checked out elsewhere (test)
565
+ + rebase: refuse to switch to a branch already checked out elsewhere (test)
566
+ + branch: fix die_if_checked_out() when ignore_current_worktree
567
+ + worktree: introduce is_shared_symref()
568
569
A few subcommands have been taught to stop users from working on a
570
branch that is being used in another worktree linked to the same
571
repository.
572
+
573
+ Will cook in 'next'.
574
source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
575
576
577
* rj/bisect-already-used-branch (2023-01-22) 1 commit
657
- - bisect: fix "reset" when branch is checked out elsewhere
578
+ (merged to 'next' on 2023-03-06 at 3508814a41)
579
+ + bisect: fix "reset" when branch is checked out elsewhere
580
581
Allow "git bisect reset [name]" to check out the named branch (or
582
the original one) even when the branch is already checked out in a
583
different worktree linked to the same repository.
584
663
- Will merge to 'next'.
585
+ Will cook in 'next'.
586
source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
587
588
@@ -676,31 +598,32 @@ Release tarballs are available at:
598
source: <20230120012459.920932-1-michael.strawbridge@amd.com>
599
600
679
-* tc/cat-file-z-use-cquote (2023-01-16) 1 commit
680
- - cat-file: quote-format name in error when using -z
601
+* tc/cat-file-z-use-cquote (2023-03-03) 2 commits
602
+ . cat-file: quote-format name in error when using -z
603
+ . cat-file: extract printing batch error message into function
604
605
"cat-file" in the batch mode that is fed NUL-terminated pathnames
606
learned to cquote them in its error output (otherwise, a funny
607
pathname with LF in it would break the lines in the output stream).
608
686
- Expecting a reroll.
687
- cf. <2a2a46f0-a9bc-06a6-72e1-28800518777c@dunelm.org.uk>
688
- source: <20230116190749.4141516-1-toon@iotcl.com>
609
+ Breaks "cat-file --batch-all-objects --batch-check".
610
+ cf. <xmqqilfhctrr.fsf@gitster.g>
611
+ source: <20230303191708.77894-1-toon@iotcl.com>
612
613
691
-* cw/submodule-status-in-parallel (2023-02-09) 6 commits
614
+* cw/submodule-status-in-parallel (2023-03-02) 6 commits
615
- diff-lib: parallelize run_diff_files for submodules
616
- diff-lib: refactor out diff_change logic
617
- submodule: refactor is_submodule_modified()
618
- submodule: move status parsing into function
696
- - submodule: strbuf variable rename
697
- - run-command: add duplicate_output_fn to run_processes_parallel_opts
619
+ - submodule: rename strbuf variable
620
+ - run-command: add on_stderr_output_fn to run_processes_parallel_opts
621
622
"git submodule status" learned to run the comparison in submodule
623
repositories in parallel.
624
702
- Not quite there yet...
703
- source: <20230209000212.1892457-1-calvinwan@google.com>
625
+ Comments?
626
+ source: <20230302215237.1473444-1-calvinwan@google.com>
627
628
--------------------------------------------------
629
[Discarded]