What's cooking (2024/01 #08)
Junio C Hamano committed
Jan 26, 2024 at 14:38 UTC
59dece08c46bb48716f56a2bc3aeb2477e174208
1 file changed
+283
-228
whats-cooking.txt
+283
-228
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2024, #07; Tue, 23)
3
-X-master-at: e02ecfcc534e2021aae29077a958dd11c3897e4c
4
-X-next-at: 5fa4633015b7717427c4e333557e072f1a2b5e69
2
+Subject: What's cooking in git.git (Jan 2024, #08; Fri, 26)
3
+X-master-at: b50a608ba20348cb3dfc16a696816d51780e3f0f
4
+X-next-at: 3e4c9d132487b980300188f22102599edd76b6cd
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2024, #07; Tue, 23)
7
+What's cooking in git.git (Jan 2024, #08; Fri, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,9 +45,243 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* al/unit-test-ctype (2024-01-16) 1 commit
52
+ (merged to 'next' on 2024-01-19 at fcdad0d06c)
53
+ + unit-tests: rewrite t/helper/test-ctype.c as a unit test
54
+
55
+ Move test-ctype helper to the unit-test framework.
56
+ source: <20240112102743.1440-1-ach.lumap@gmail.com>
57
+
58
+
59
+* es/some-up-to-date-messages-must-stay (2024-01-12) 1 commit
60
+ (merged to 'next' on 2024-01-16 at 2b598f7de2)
61
+ + messages: mark some strings with "up-to-date" not to touch
62
+
63
+ Comment updates to help developers not to attempt to modify
64
+ messages from plumbing commands that must stay constant.
65
+
66
+ It might make sense to reassess the plumbing needs every few years,
67
+ but that should be done as a separate effort.
68
+ source: <20240112171910.11131-1-ericsunshine@charter.net>
69
+
70
+
71
+* gt/test-commit-o-i-options (2024-01-17) 2 commits
72
+ (merged to 'next' on 2024-01-19 at 0377e2c148)
73
+ + t7501: add tests for --amend --signoff
74
+ + t7501: add tests for --include and --only
75
+
76
+ A few tests to "git commit -o <pathspec>" and "git commit -i
77
+ <pathspec>" has been added.
78
+ source: <20240117161421.17333-1-shyamthakkar001@gmail.com>
79
+
80
+
81
+* jt/tests-with-reftable (2024-01-12) 2 commits
82
+ (merged to 'next' on 2024-01-19 at 498d203a57)
83
+ + t5541: remove lockfile creation
84
+ + t1401: remove lockfile creation
85
+
86
+ Tweak a few tests not to manually modify the reference database
87
+ (hence easier to work with other backends like reftable).
88
+ source: <pull.1634.v2.git.1705004670.gitgitgadget@gmail.com>
89
+
90
+
91
+* kh/maintenance-use-xdg-when-it-should (2024-01-18) 4 commits
92
+ (merged to 'next' on 2024-01-19 at 9c8c7b2e9d)
93
+ + maintenance: use XDG config if it exists
94
+ + config: factor out global config file retrieval
95
+ + config: rename global config function
96
+ + config: format newlines
97
+
98
+ When $HOME/.gitignore is missing but XDG config file available, we
99
+ should write into the latter, not former. "git gc" and "git
100
+ maintenance" wrote into a wrong "global config" file, which have
101
+ been corrected.
102
+ source: <cover.1705593810.git.code@khaugsbakk.name>
103
+
104
+
105
+* la/strvec-comment-fix (2024-01-12) 1 commit
106
+ (merged to 'next' on 2024-01-19 at 120ef16493)
107
+ + strvec: use correct member name in comments
108
+
109
+ Comment fix.
110
+ source: <pull.1640.git.1705043195997.gitgitgadget@gmail.com>
111
+
112
+
113
+* mj/gitweb-unreadable-config-error (2024-01-10) 1 commit
114
+ (merged to 'next' on 2024-01-19 at 790b7a7855)
115
+ + gitweb: die when a configuration file cannot be read
116
+
117
+ When given an existing but unreadable file as a configuration file,
118
+ gitweb behaved as if the file did not exist at all, but now it
119
+ errors out. This is a change that may break backward compatibility.
120
+ source: <20240110225709.30168-1-marcelo.jimenez@gmail.com>
121
+
122
+
123
+* ne/doc-filter-blob-limit-fix (2024-01-16) 1 commit
124
+ (merged to 'next' on 2024-01-19 at 4f78975728)
125
+ + rev-list-options: fix off-by-one in '--filter=blob:limit=<n>' explainer
126
+
127
+ Docfix.
128
+ source: <pull.1645.git.git.1705261850650.gitgitgadget@gmail.com>
129
+
130
+
131
+* ps/commit-graph-write-leakfix (2024-01-15) 1 commit
132
+ (merged to 'next' on 2024-01-19 at df537fac39)
133
+ + commit-graph: fix memory leak when not writing graph
134
+
135
+ Leakfix.
136
+ source: <0feab5e7d5bc6275e2c7671cd8f6786ea86fd610.1702891190.git.ps@pks.im>
137
+
138
+
139
+* ps/completion-with-reftable-fix (2024-01-16) 5 commits
140
+ (merged to 'next' on 2024-01-19 at 8854a7d903)
141
+ + completion: treat dangling symrefs as existing pseudorefs
142
+ + completion: silence pseudoref existence check
143
+ + completion: improve existence check for pseudo-refs
144
+ + t9902: verify that completion does not print anything
145
+ + completion: discover repo path in `__git_pseudoref_exists ()`
146
+
147
+ Completion update to prepare for reftable
148
+ source: <cover.1705314554.git.ps@pks.im>
149
+
150
+
151
+* ps/gitlab-ci-macos (2024-01-18) 6 commits
152
+ (merged to 'next' on 2024-01-19 at a239dc8140)
153
+ + ci: add macOS jobs to GitLab CI
154
+ + ci: make p4 setup on macOS more robust
155
+ + ci: handle TEST_OUTPUT_DIRECTORY when printing test failures
156
+ + Makefile: detect new Homebrew location for ARM-based Macs
157
+ + t7527: decrease likelihood of racing with fsmonitor daemon
158
+ + Merge branch 'ps/gitlab-ci-static-analysis' into ps/gitlab-ci-macos
159
+
160
+ CI for GitLab learned to drive macOS jobs.
161
+ source: <cover.1705573336.git.ps@pks.im>
162
+
163
+
164
+* ps/worktree-refdb-initialization (2024-01-08) 7 commits
165
+ (merged to 'next' on 2024-01-19 at e8c649a3ac)
166
+ + builtin/worktree: create refdb via ref backend
167
+ + worktree: expose interface to look up worktree by name
168
+ + builtin/worktree: move setup of commondir file earlier
169
+ + refs/files: skip creation of "refs/{heads,tags}" for worktrees
170
+ + setup: move creation of "refs/" into the files backend
171
+ + refs: prepare `refs_init_db()` for initializing worktree refs
172
+ + Merge branch 'ps/refstorage-extension' into ps/worktree-refdb-initialization
173
+
174
+ Instead of manually creating refs/ hierarchy on disk upon a
175
+ creation of a secondary worktree, which is only usable via the
176
+ files backend, use the refs API to populate it.
177
+ source: <cover.1704705733.git.ps@pks.im>
178
+
179
+
180
+* rj/advice-delete-branch-not-fully-merged (2024-01-11) 3 commits
181
+ (merged to 'next' on 2024-01-19 at 7102eb6b79)
182
+ + branch: make the advice to force-deleting a conditional one
183
+ + advice: fix an unexpected leading space
184
+ + advice: sort the advice related lists
185
+ (this branch is used by rj/advice-disable-how-to-disable.)
186
+
187
+ The error message given when "git branch -d branch" fails due to
188
+ commits unique to the branch has been split into an error and a new
189
+ conditional advice message.
190
+ source: <4aedc15c-4b3f-4f5e-abea-581b501600f8@gmail.com>
191
+
192
+
193
+* vd/fsck-submodule-url-test (2024-01-19) 4 commits
194
+ (merged to 'next' on 2024-01-19 at dad35ae82c)
195
+ + submodule-config.c: strengthen URL fsck check
196
+ + t7450: test submodule urls
197
+ + test-submodule: remove command line handling for check-name
198
+ + submodule-config.h: move check_submodule_url
199
+
200
+ Tighten URL checks fsck makes in a URL recorded for submodules.
201
+ source: <pull.1635.v2.git.1705542918.gitgitgadget@gmail.com>
202
+
203
--------------------------------------------------
204
[New Topics]
205
206
+* jc/coc-whitespace-fix (2024-01-23) 1 commit
207
+ (merged to 'next' on 2024-01-26 at 6fb290ad59)
208
+ + CoC: whitespace fix
209
+
210
+ Docfix.
211
+
212
+ Will merge to 'master'.
213
+ source: <xmqqmssvnb8d.fsf_-_@gitster.g>
214
+
215
+
216
+* jc/ls-files-doc-update (2024-01-25) 1 commit
217
+ (merged to 'next' on 2024-01-26 at a71aeec3d3)
218
+ + ls-files: avoid the verb "deprecate" for individual options
219
+
220
+ The documentation for the --exclude-per-directory option marked it
221
+ as deprecated, which confused readers into thinking there may be a
222
+ plan to remove it in the future, which was not our intention.
223
+
224
+ Will merge to 'master'.
225
+ source: <xmqqjznybfp4.fsf@gitster.g>
226
+
227
+
228
+* jk/fetch-auto-tag-following-fix (2024-01-24) 1 commit
229
+ (merged to 'next' on 2024-01-26 at d058f1511b)
230
+ + transport-helper: re-examine object dir after fetching
231
+
232
+ Fetching via protocol v0 over Smart HTTP transport sometimes failed
233
+ to correctly auto-follow tags.
234
+
235
+ Will merge to 'master'.
236
+ source: <20240124010056.GA2603087@coredump.intra.peff.net>
237
+
238
+
239
+* ps/reftable-compacted-tables-permission-fix (2024-01-26) 1 commit
240
+ - reftable/stack: adjust permissions of compacted tables
241
+
242
+ Reftable bugfix.
243
+
244
+ Will merge to 'next'.
245
+ source: <a211818108053754aca002726d0206623a347952.1706263589.git.ps@pks.im>
246
+
247
+
248
+* jc/index-pack-fsck-levels (2024-01-26) 2 commits
249
+ - index-pack: --fsck-objects to take an optional argument for fsck msgs
250
+ - index-pack: test and document --strict=<msg-id>=<severity>...
251
+
252
+ The "--fsck-objects" option of "git index-pack" now can take the
253
+ optional parameter to tweak severity of different fsck errors.
254
+
255
+ Expecting a reroll.
256
+ cf. <BF772E83-2BFE-4652-A742-67FADF3D8FE2@gmail.com>
257
+ source: <pull.1658.v3.git.git.1706302749.gitgitgadget@gmail.com>
258
+
259
+
260
+* zf/subtree-split-fix (2024-01-25) 1 commit
261
+ (merged to 'next' on 2024-01-26 at a09e02f208)
262
+ + subtree: fix split processing with multiple subtrees present
263
+
264
+ "git subtree" (in contrib/) update.
265
+
266
+ Will merge to 'master'.
267
+ source: <pull.1587.v6.git.1701442494319.gitgitgadget@gmail.com>
268
+
269
+
270
+* ps/reftable-multi-level-indices-fix (2024-01-26) 6 commits
271
+ - reftable: document reading and writing indices
272
+ - reftable/writer: fix writing multi-level indices
273
+ - reftable/writer: simplify writing index records
274
+ - reftable/writer: use correct type to iterate through index entries
275
+ - reftable/reader: be more careful about errors in indexed seeks
276
+ - Merge branch 'jc/reftable-core-fsync' into ps/reftable-multi-level-indices-fix
277
+ (this branch uses jc/reftable-core-fsync.)
278
+
279
+ Write multi-level indices for reftable has been corrected.
280
+ source: <cover.1706263918.git.ps@pks.im>
281
+
282
+--------------------------------------------------
283
+[Cooking]
284
+
285
* al/t2400-depipe (2024-01-20) 1 commit
286
(merged to 'next' on 2024-01-22 at a20d4a9a7f)
287
+ t2400: avoid losing exit status to pipes
@@ -59,14 +293,15 @@ Release tarballs are available at:
293
294
295
* kl/allow-working-in-dot-git-in-non-bare-repository (2024-01-20) 1 commit
62
- - setup: allow cwd=.git w/ bareRepository=explicit
296
+ (merged to 'next' on 2024-01-24 at e77b796e11)
297
+ + setup: allow cwd=.git w/ bareRepository=explicit
298
299
Loosen "disable repository discovery of a bare repository" check,
300
triggered by setting safe.bareRepository configuration variable to
301
'explicit', to exclude the ".git/" directory inside a non-bare
302
repository from the check.
303
69
- Will merge to 'next'.
304
+ Will merge to 'master'.
305
source: <pull.1645.git.1705709303098.gitgitgadget@gmail.com>
306
307
@@ -95,71 +330,41 @@ Release tarballs are available at:
330
331
332
* pb/complete-log-more (2024-01-22) 4 commits
98
- - completion: complete missing 'git log' options
99
- - completion: complete --encoding
100
- - completion: complete --patch-with-raw
101
- - completion: complete missing rev-list options
333
+ (merged to 'next' on 2024-01-24 at 081d2a92fa)
334
+ + completion: complete missing 'git log' options
335
+ + completion: complete --encoding
336
+ + completion: complete --patch-with-raw
337
+ + completion: complete missing rev-list options
338
339
The completion script (in contrib/) learned more options that can
340
be used with "git log".
341
106
- Will merge to 'next'.
342
+ Will merge to 'master'.
343
source: <pull.1650.git.git.1705810071.gitgitgadget@gmail.com>
344
345
346
* jc/reftable-core-fsync (2024-01-23) 1 commit
111
- - reftable: honor core.fsync
347
+ (merged to 'next' on 2024-01-24 at cea12beddb)
348
+ + reftable: honor core.fsync
349
+ (this branch is used by ps/reftable-multi-level-indices-fix.)
350
351
The write codepath for the reftable data learned to honor
352
core.fsync configuration.
353
116
- Will merge to 'next'.
117
- source: <pull.1654.git.git.1706035870956.gitgitgadget@gmail.com>
118
-
119
---------------------------------------------------
120
-[Cooking]
121
-
122
-* kh/maintenance-use-xdg-when-it-should (2024-01-18) 4 commits
123
- (merged to 'next' on 2024-01-19 at 9c8c7b2e9d)
124
- + maintenance: use XDG config if it exists
125
- + config: factor out global config file retrieval
126
- + config: rename global config function
127
- + config: format newlines
128
-
129
- When $HOME/.gitignore is missing but XDG config file available, we
130
- should write into the latter, not former. "git gc" and "git
131
- maintenance" wrote into a wrong "global config" file, which have
132
- been corrected.
133
-
354
Will merge to 'master'.
135
- source: <cover.1705593810.git.code@khaugsbakk.name>
136
-
137
-
138
-* ps/gitlab-ci-macos (2024-01-18) 6 commits
139
- (merged to 'next' on 2024-01-19 at a239dc8140)
140
- + ci: add macOS jobs to GitLab CI
141
- + ci: make p4 setup on macOS more robust
142
- + ci: handle TEST_OUTPUT_DIRECTORY when printing test failures
143
- + Makefile: detect new Homebrew location for ARM-based Macs
144
- + t7527: decrease likelihood of racing with fsmonitor daemon
145
- + Merge branch 'ps/gitlab-ci-static-analysis' into ps/gitlab-ci-macos
146
-
147
- CI for GitLab learned to drive macOS jobs.
148
-
149
- Will merge to 'master'.
150
- source: <cover.1705573336.git.ps@pks.im>
355
+ source: <pull.1654.git.git.1706035870956.gitgitgadget@gmail.com>
356
357
153
-* ad/custom-merge-placeholder-for-symbolic-pathnames (2024-01-18) 1 commit
154
- - merge-ll: expose revision names to custom drivers
358
+* ad/custom-merge-placeholder-for-symbolic-pathnames (2024-01-24) 1 commit
359
+ (merged to 'next' on 2024-01-24 at d9cf4e227d)
360
+ + merge-ll: expose revision names to custom drivers
361
362
The labels on conflict markers for the common ancestor, our version,
363
and the other version are available to custom 3-way merge driver
364
via %S, %X, and %Y placeholders.
365
160
- Expecting a reroll.
161
- cf. <xmqqcytvei3c.fsf@gitster.g>
162
- source: <pull.1648.v3.git.git.1705615794307.gitgitgadget@gmail.com>
366
+ Will merge to 'master'.
367
+ source: <pull.1648.v4.git.git.1706126951879.gitgitgadget@gmail.com>
368
369
370
* cp/unit-test-prio-queue (2024-01-22) 1 commit
@@ -170,22 +375,23 @@ Release tarballs are available at:
375
376
377
* jc/reffiles-tests (2024-01-22) 12 commits
173
- - t5312: move reffiles specific tests to t0601
174
- - t4202: move reffiles specific tests to t0600
175
- - t3903: make drop stash test ref backend agnostic
176
- - t1503: move reffiles specific tests to t0600
177
- - t1415: move reffiles specific tests to t0601
178
- - t1410: move reffiles specific tests to t0600
179
- - t1406: move reffiles specific tests to t0600
180
- - t1405: move reffiles specific tests to t0601
181
- - t1404: move reffiles specific tests to t0600
182
- - t1414: convert test to use Git commands instead of writing refs manually
183
- - remove REFFILES prerequisite for some tests in t1405 and t2017
184
- - t3210: move to t0601
378
+ (merged to 'next' on 2024-01-24 at 0d1aaa6807)
379
+ + t5312: move reffiles specific tests to t0601
380
+ + t4202: move reffiles specific tests to t0600
381
+ + t3903: make drop stash test ref backend agnostic
382
+ + t1503: move reffiles specific tests to t0600
383
+ + t1415: move reffiles specific tests to t0601
384
+ + t1410: move reffiles specific tests to t0600
385
+ + t1406: move reffiles specific tests to t0600
386
+ + t1405: move reffiles specific tests to t0601
387
+ + t1404: move reffiles specific tests to t0600
388
+ + t1414: convert test to use Git commands instead of writing refs manually
389
+ + remove REFFILES prerequisite for some tests in t1405 and t2017
390
+ + t3210: move to t0601
391
392
Tests on ref API are moved around to prepare for reftable.
393
188
- Will merge to 'next'.
394
+ Will merge to 'master'.
395
cf. <Za5TW-q4cKS8pNNc@tanuki>
396
source: <pull.1647.v2.git.git.1705695540.gitgitgadget@gmail.com>
397
@@ -253,21 +459,19 @@ Release tarballs are available at:
459
source: <cover.1705700054.git.steadmon@google.com>
460
461
256
-* kn/for-all-refs (2024-01-19) 5 commits
462
+* kn/for-all-refs (2024-01-24) 4 commits
463
- for-each-ref: avoid filtering on empty pattern
464
- refs: introduce `refs_for_each_all_refs()`
465
- refs: extract out `loose_fill_ref_dir_regular_file()`
260
- - refs: make `is_pseudoref_syntax()` stricter
261
- - refs: expose `is_pseudoref_syntax()`
466
+ - refs: introduce `is_pseudoref()` and `is_headref()`
467
468
"git for-each-ref" filters its output with prefixes given from the
469
command line, but it did not honor an empty string to mean "pass
470
everything", which has been corrected.
471
267
- Expecting a reroll.
268
- cf. <CAOLa=ZQOcqGBJOSehok4BYGUE8RKtnE9eiJYogeT8E6NWZ25xw@mail.gmail.com>
269
- cf. <Za-gF_Hp_lXViGWw@tanuki>
270
- source: <20240119142705.139374-1-karthik.188@gmail.com>
472
+ Expecting a reroll?
473
+ cf. <xmqqfrymeega.fsf@gitster.g>
474
+ source: <20240124152726.124873-1-karthik.188@gmail.com>
475
476
477
* ps/not-so-many-refs-are-special (2024-01-19) 7 commits
@@ -288,20 +492,6 @@ Release tarballs are available at:
492
source: <cover.1705659748.git.ps@pks.im>
493
494
291
-* es/some-up-to-date-messages-must-stay (2024-01-12) 1 commit
292
- (merged to 'next' on 2024-01-16 at 2b598f7de2)
293
- + messages: mark some strings with "up-to-date" not to touch
294
-
295
- Comment updates to help developers not to attempt to modify
296
- messages from plumbing commands that must stay constant.
297
-
298
- It might make sense to reassess the plumbing needs every few years,
299
- but that should be done as a separate effort.
300
-
301
- Will merge to 'master'.
302
- source: <20240112171910.11131-1-ericsunshine@charter.net>
303
-
304
-
495
* bk/complete-bisect (2024-01-18) 5 commits
496
- completion: git-bisect view recognized but not completed
497
- completion: custom git-bisect terms
@@ -339,40 +529,6 @@ Release tarballs are available at:
529
source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com>
530
531
342
-* gt/test-commit-o-i-options (2024-01-17) 2 commits
343
- (merged to 'next' on 2024-01-19 at 0377e2c148)
344
- + t7501: add tests for --amend --signoff
345
- + t7501: add tests for --include and --only
346
-
347
- A few tests to "git commit -o <pathspec>" and "git commit -i
348
- <pathspec>" has been added.
349
-
350
- Will merge to 'master'.
351
- source: <20240117161421.17333-1-shyamthakkar001@gmail.com>
352
-
353
-
354
-* jt/tests-with-reftable (2024-01-12) 2 commits
355
- (merged to 'next' on 2024-01-19 at 498d203a57)
356
- + t5541: remove lockfile creation
357
- + t1401: remove lockfile creation
358
-
359
- Tweak a few tests not to manually modify the reference database
360
- (hence easier to work with other backends like reftable).
361
-
362
- Will merge to 'master'.
363
- source: <pull.1634.v2.git.1705004670.gitgitgadget@gmail.com>
364
-
365
-
366
-* la/strvec-comment-fix (2024-01-12) 1 commit
367
- (merged to 'next' on 2024-01-19 at 120ef16493)
368
- + strvec: use correct member name in comments
369
-
370
- Comment fix.
371
-
372
- Will merge to 'master'.
373
- source: <pull.1640.git.1705043195997.gitgitgadget@gmail.com>
374
-
375
-
532
* la/trailer-api (2024-01-12) 10 commits
533
- trailer: delete obsolete argument handling code from API
534
- trailer: move arg handling to interpret-trailers.c
@@ -387,11 +543,12 @@ Release tarballs are available at:
543
544
Code clean-up.
545
390
- Needs review.
546
+ Expecting a (hopefully final and small) reroll.
547
+ cf. <owlysf2l2bnj.fsf@fine.c.googlers.com>
548
source: <pull.1632.git.1704869487.gitgitgadget@gmail.com>
549
550
394
-* ps/tests-with-ref-files-backend (2024-01-12) 6 commits
551
+* ps/tests-with-ref-files-backend (2024-01-24) 6 commits
552
- t: mark tests regarding git-pack-refs(1) to be backend specific
553
- t5526: break test submodule differently
554
- t1419: mark test suite as files-backend specific
@@ -403,42 +560,7 @@ Release tarballs are available at:
560
backends.
561
562
Needs review.
406
- source: <cover.1704877233.git.ps@pks.im>
407
-
408
-
409
-* ne/doc-filter-blob-limit-fix (2024-01-16) 1 commit
410
- (merged to 'next' on 2024-01-19 at 4f78975728)
411
- + rev-list-options: fix off-by-one in '--filter=blob:limit=<n>' explainer
412
-
413
- Docfix.
414
-
415
- Will merge to 'master'.
416
- source: <pull.1645.git.git.1705261850650.gitgitgadget@gmail.com>
417
-
418
-
419
-* ps/commit-graph-write-leakfix (2024-01-15) 1 commit
420
- (merged to 'next' on 2024-01-19 at df537fac39)
421
- + commit-graph: fix memory leak when not writing graph
422
-
423
- Leakfix.
424
-
425
- Will merge to 'master'.
426
- source: <0feab5e7d5bc6275e2c7671cd8f6786ea86fd610.1702891190.git.ps@pks.im>
427
-
428
-
429
-* rj/advice-delete-branch-not-fully-merged (2024-01-11) 3 commits
430
- (merged to 'next' on 2024-01-19 at 7102eb6b79)
431
- + branch: make the advice to force-deleting a conditional one
432
- + advice: fix an unexpected leading space
433
- + advice: sort the advice related lists
434
- (this branch is used by rj/advice-disable-how-to-disable.)
435
-
436
- The error message given when "git branch -d branch" fails due to
437
- commits unique to the branch has been split into an error and a new
438
- conditional advice message.
439
-
440
- Will merge to 'master'.
441
- source: <4aedc15c-4b3f-4f5e-abea-581b501600f8@gmail.com>
563
+ source: <cover.1706085756.git.ps@pks.im>
564
565
566
* en/diffcore-delta-final-line-fix (2024-01-18) 1 commit
@@ -452,32 +574,6 @@ Release tarballs are available at:
574
source: <pull.1637.v2.git.1705119973690.gitgitgadget@gmail.com>
575
576
455
-* mj/gitweb-unreadable-config-error (2024-01-10) 1 commit
456
- (merged to 'next' on 2024-01-19 at 790b7a7855)
457
- + gitweb: die when a configuration file cannot be read
458
-
459
- When given an existing but unreadable file as a configuration file,
460
- gitweb behaved as if the file did not exist at all, but now it
461
- errors out. This is a change that may break backward compatibility.
462
-
463
- Will merge to 'master'.
464
- source: <20240110225709.30168-1-marcelo.jimenez@gmail.com>
465
-
466
-
467
-* ps/completion-with-reftable-fix (2024-01-16) 5 commits
468
- (merged to 'next' on 2024-01-19 at 8854a7d903)
469
- + completion: treat dangling symrefs as existing pseudorefs
470
- + completion: silence pseudoref existence check
471
- + completion: improve existence check for pseudo-refs
472
- + t9902: verify that completion does not print anything
473
- + completion: discover repo path in `__git_pseudoref_exists ()`
474
-
475
- Completion update to prepare for reftable
476
-
477
- Will merge to 'master'.
478
- source: <cover.1705314554.git.ps@pks.im>
479
-
480
-
577
* ps/reftable-optimize-io (2024-01-18) 7 commits
578
(merged to 'next' on 2024-01-22 at b867e8b9a8)
579
+ reftable/stack: fix race in up-to-date check
@@ -500,7 +596,6 @@ Release tarballs are available at:
596
(merged to 'next' on 2024-01-23 at f456f4937d)
597
+ advice: allow disabling the automatic hint in advise_if_enabled()
598
+ Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how-to-disable
503
- (this branch uses rj/advice-delete-branch-not-fully-merged.)
599
600
All conditional "advice" messages show how to turn them off, which
601
becomes repetitive. Add a configuration variable to omit the
@@ -510,44 +605,14 @@ Release tarballs are available at:
605
source: <6a842ef8-b390-4739-9eef-e867d55ed5ea@gmail.com>
606
607
513
-* vd/fsck-submodule-url-test (2024-01-19) 4 commits
514
- (merged to 'next' on 2024-01-19 at dad35ae82c)
515
- + submodule-config.c: strengthen URL fsck check
516
- + t7450: test submodule urls
517
- + test-submodule: remove command line handling for check-name
518
- + submodule-config.h: move check_submodule_url
519
-
520
- Tighten URL checks fsck makes in a URL recorded for submodules.
521
-
522
- Will merge to 'master'.
523
- source: <pull.1635.v2.git.1705542918.gitgitgadget@gmail.com>
524
-
525
-
608
* sd/negotiate-trace-fix (2024-01-03) 1 commit
527
- - push: region_leave trace for negotiate_using_fetch
609
+ (merged to 'next' on 2024-01-24 at 6305853ab2)
610
+ + push: region_leave trace for negotiate_using_fetch
611
612
Tracing fix.
613
531
- Will merge to 'next'?
532
- source: <20240103224054.1940209-1-delmerico@google.com>
533
-
534
-
535
-* ps/worktree-refdb-initialization (2024-01-08) 7 commits
536
- (merged to 'next' on 2024-01-19 at e8c649a3ac)
537
- + builtin/worktree: create refdb via ref backend
538
- + worktree: expose interface to look up worktree by name
539
- + builtin/worktree: move setup of commondir file earlier
540
- + refs/files: skip creation of "refs/{heads,tags}" for worktrees
541
- + setup: move creation of "refs/" into the files backend
542
- + refs: prepare `refs_init_db()` for initializing worktree refs
543
- + Merge branch 'ps/refstorage-extension' into ps/worktree-refdb-initialization
544
-
545
- Instead of manually creating refs/ hierarchy on disk upon a
546
- creation of a secondary worktree, which is only usable via the
547
- files backend, use the refs API to populate it.
548
-
614
Will merge to 'master'.
550
- source: <cover.1704705733.git.ps@pks.im>
615
+ source: <20240103224054.1940209-1-delmerico@google.com>
616
617
618
* cp/apply-core-filemode (2023-12-26) 3 commits
@@ -565,16 +630,6 @@ Release tarballs are available at:
630
source: <20231226233218.472054-1-gitster@pobox.com>
631
632
568
-* al/unit-test-ctype (2024-01-16) 1 commit
569
- (merged to 'next' on 2024-01-19 at fcdad0d06c)
570
- + unit-tests: rewrite t/helper/test-ctype.c as a unit test
571
-
572
- Move test-ctype helper to the unit-test framework.
573
-
574
- Will merge to 'master'.
575
- source: <20240112102743.1440-1-ach.lumap@gmail.com>
576
-
577
-
633
* ja/doc-placeholders-fix (2023-12-26) 2 commits
634
- doc: enforce placeholders in documentation
635
- doc: enforce dashes in placeholders
@@ -633,7 +688,7 @@ Release tarballs are available at:
688
on systems whose "char" is unsigned; update the implementation and
689
bump the format version to 2.
690
636
- Will merge to 'next'?
691
+ Will merge to 'next'.
692
source: <cover.1705442923.git.me@ttaylorr.com>
693
694