What's cooking (2024/02 #01)
Junio C Hamano committed
Feb 2, 2024 at 14:30 UTC
00e4c218fb2a74e41b714c0d7c551abef643fb27
1 file changed
+346
-301
whats-cooking.txt
+346
-301
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2024, #09; Mon, 29)
3
-X-master-at: c5b454771e6b086f60c7f1f139025f174bcedac9
4
-X-next-at: fb1a86299d91ca856248ba2018147aff99ef91fd
2
+Subject: What's cooking in git.git (Feb 2024, #01; Fri, 2)
3
+X-master-at: 2a540e432fe5dff3cfa9d3bf7ca56db2ad12ebb9
4
+X-next-at: 05954cdfa36fd5c325af9dde784879dcc78384ff
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2024, #09; Mon, 29)
7
+What's cooking in git.git (Feb 2024, #01; Fri, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,157 +48,362 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* al/t2400-depipe (2024-01-20) 1 commit
52
- (merged to 'next' on 2024-01-22 at a20d4a9a7f)
53
- + t2400: avoid losing exit status to pipes
51
+* ad/custom-merge-placeholder-for-symbolic-pathnames (2024-01-24) 1 commit
52
+ (merged to 'next' on 2024-01-24 at d9cf4e227d)
53
+ + merge-ll: expose revision names to custom drivers
54
55
- Coding style fix.
56
- source: <20240120021547.199-1-ach.lumap@gmail.com>
55
+ The labels on conflict markers for the common ancestor, our version,
56
+ and the other version are available to custom 3-way merge driver
57
+ via %S, %X, and %Y placeholders.
58
+ source: <pull.1648.v4.git.git.1706126951879.gitgitgadget@gmail.com>
59
60
59
-* en/diffcore-delta-final-line-fix (2024-01-18) 1 commit
60
- (merged to 'next' on 2024-01-22 at 7141d202cb)
61
- + diffcore-delta: avoid ignoring final 'line' of file
61
+* jc/coc-whitespace-fix (2024-01-23) 1 commit
62
+ (merged to 'next' on 2024-01-26 at 6fb290ad59)
63
+ + CoC: whitespace fix
64
63
- Rename detection logic ignored the final line of a file if it is an
64
- incomplete line.
65
- source: <pull.1637.v2.git.1705119973690.gitgitgadget@gmail.com>
65
+ Docfix.
66
+ source: <xmqqmssvnb8d.fsf_-_@gitster.g>
67
68
68
-* gt/t0024-style-fixes (2024-01-20) 2 commits
69
- (merged to 'next' on 2024-01-22 at 36b46efbd0)
70
- + t0024: style fix
71
- + t0024: avoid losing exit status to pipes
69
+* jc/ls-files-doc-update (2024-01-25) 1 commit
70
+ (merged to 'next' on 2024-01-26 at a71aeec3d3)
71
+ + ls-files: avoid the verb "deprecate" for individual options
72
73
- Coding style fix.
74
- source: <20240118215407.8609-1-shyamthakkar001@gmail.com>
73
+ The documentation for the --exclude-per-directory option marked it
74
+ as deprecated, which confused readers into thinking there may be a
75
+ plan to remove it in the future, which was not our intention.
76
+ source: <xmqqjznybfp4.fsf@gitster.g>
77
78
77
-* jc/majordomo-to-subspace (2024-01-20) 1 commit
78
- (merged to 'next' on 2024-01-22 at 6a95f43de4)
79
- + Docs: majordomo@vger.kernel.org has been decomissioned
79
+* jc/reffiles-tests (2024-01-22) 12 commits
80
+ (merged to 'next' on 2024-01-24 at 0d1aaa6807)
81
+ + t5312: move reffiles specific tests to t0601
82
+ + t4202: move reffiles specific tests to t0600
83
+ + t3903: make drop stash test ref backend agnostic
84
+ + t1503: move reffiles specific tests to t0600
85
+ + t1415: move reffiles specific tests to t0601
86
+ + t1410: move reffiles specific tests to t0600
87
+ + t1406: move reffiles specific tests to t0600
88
+ + t1405: move reffiles specific tests to t0601
89
+ + t1404: move reffiles specific tests to t0600
90
+ + t1414: convert test to use Git commands instead of writing refs manually
91
+ + remove REFFILES prerequisite for some tests in t1405 and t2017
92
+ + t3210: move to t0601
93
81
- Doc update.
82
- source: <xmqqmst1hsd6.fsf@gitster.g>
94
+ Tests on ref API are moved around to prepare for reftable.
95
+ cf. <Za5TW-q4cKS8pNNc@tanuki>
96
+ source: <pull.1647.v2.git.git.1705695540.gitgitgadget@gmail.com>
97
98
85
-* js/oss-fuzz-build-in-ci (2024-01-19) 2 commits
86
- (merged to 'next' on 2024-01-22 at 2954da5a39)
87
- + ci: build and run minimal fuzzers in GitHub CI
88
- + fuzz: fix fuzz test build rules
99
+* jk/fetch-auto-tag-following-fix (2024-01-24) 1 commit
100
+ (merged to 'next' on 2024-01-26 at d058f1511b)
101
+ + transport-helper: re-examine object dir after fetching
102
90
- oss-fuzz tests are built and run in CI.
91
- source: <cover.1705700054.git.steadmon@google.com>
103
+ Fetching via protocol v0 over Smart HTTP transport sometimes failed
104
+ to correctly auto-follow tags.
105
+ source: <20240124010056.GA2603087@coredump.intra.peff.net>
106
107
94
-* nb/rebase-x-shell-docfix (2024-01-17) 1 commit
95
- (merged to 'next' on 2024-01-22 at db49e10354)
96
- + rebase: fix documentation about used shell in -x
108
+* jx/remote-archive-over-smart-http (2024-01-22) 6 commits
109
+ (merged to 'next' on 2024-01-23 at 5fa4633015)
110
+ + transport-helper: call do_take_over() in process_connect
111
+ + transport-helper: call do_take_over() in connect_helper
112
+ + http-backend: new rpc-service for git-upload-archive
113
+ + transport-helper: protocol v2 supports upload-archive
114
+ + remote-curl: supports git-upload-archive service
115
+ + transport-helper: no connection restriction in connect_helper
116
98
- Doc update.
99
- source: <20240117085347.948960-1-nik.borisov@suse.com>
117
+ "git archive --remote=<remote>" learned to talk over the smart
118
+ http (aka stateless) transport.
119
+ source: <cover.1705841443.git.zhiyou.jx@alibaba-inc.com>
120
121
102
-* ps/not-so-many-refs-are-special (2024-01-19) 7 commits
103
- (merged to 'next' on 2024-01-22 at f70f463847)
104
- + Documentation: add "special refs" to the glossary
105
- + refs: redefine special refs
106
- + refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
107
- + sequencer: introduce functions to handle autostashes via refs
108
- + refs: convert AUTO_MERGE to become a normal pseudo-ref
109
- + sequencer: delete REBASE_HEAD in correct repo when picking commits
110
- + sequencer: clean up pseudo refs with REF_NO_DEREF
122
+* kl/allow-working-in-dot-git-in-non-bare-repository (2024-01-20) 1 commit
123
+ (merged to 'next' on 2024-01-24 at e77b796e11)
124
+ + setup: allow cwd=.git w/ bareRepository=explicit
125
112
- Define "special ref" as a very narrow set that consists of
113
- FETCH_HEAD and MERGE_HEAD, and clarify everything else that used to
114
- be classified as such are actually just pseudorefs.
115
- source: <cover.1705659748.git.ps@pks.im>
126
+ The "disable repository discovery of a bare repository" check,
127
+ triggered by setting safe.bareRepository configuration variable to
128
+ 'explicit', has been loosened to exclude the ".git/" directory inside
129
+ a non-bare repository from the check. So you can do "cd .git &&
130
+ git cmd" to run a Git command that works on a bare repository without
131
+ explicitly specifying $GIT_DIR now.
132
+ source: <pull.1645.git.1705709303098.gitgitgadget@gmail.com>
133
134
118
-* ps/reftable-optimize-io (2024-01-18) 7 commits
119
- (merged to 'next' on 2024-01-22 at b867e8b9a8)
120
- + reftable/stack: fix race in up-to-date check
121
- + reftable/stack: unconditionally reload stack after commit
122
- (merged to 'next' on 2024-01-12 at 4096e880e0)
123
- + reftable/blocksource: use mmap to read tables
124
- + reftable/blocksource: refactor code to match our coding style
125
- + reftable/stack: use stat info to avoid re-reading stack list
126
- + reftable/stack: refactor reloading to use file descriptor
127
- + reftable/stack: refactor stack reloading to have common exit path
135
+* pb/ci-github-skip-logs-for-broken-tests (2024-01-22) 1 commit
136
+ (merged to 'next' on 2024-01-23 at f5e3ab2092)
137
+ + ci(github): also skip logs of broken test cases
138
129
- Low-level I/O optimization for reftable.
130
- source: <cover.1704966670.git.ps@pks.im>
131
- source: <cover.1705585037.git.ps@pks.im>
139
+ GitHub CI update.
140
+ cf. <dbe25fff-e1d4-41f2-8f8f-c538e8c2a77e@github.com>
141
+ source: <pull.1649.git.git.1705808313306.gitgitgadget@gmail.com>
142
143
134
-* tc/show-ref-exists-fix (2024-01-18) 1 commit
135
- (merged to 'next' on 2024-01-22 at 831452f2dd)
136
- + builtin/show-ref: treat directory as non-existing in --exists
144
+* pb/complete-log-more (2024-01-22) 4 commits
145
+ (merged to 'next' on 2024-01-24 at 081d2a92fa)
146
+ + completion: complete missing 'git log' options
147
+ + completion: complete --encoding
148
+ + completion: complete --patch-with-raw
149
+ + completion: complete missing rev-list options
150
+
151
+ The completion script (in contrib/) learned more options that can
152
+ be used with "git log".
153
+ source: <pull.1650.git.git.1705810071.gitgitgadget@gmail.com>
154
+
155
+
156
+* rj/advice-disable-how-to-disable (2024-01-16) 2 commits
157
+ (merged to 'next' on 2024-01-23 at f456f4937d)
158
+ + advice: allow disabling the automatic hint in advise_if_enabled()
159
+ + Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how-to-disable
160
+
161
+ All conditional "advice" messages show how to turn them off, which
162
+ becomes repetitive. Setting advice.* configuration explicitly on
163
+ now omits the instruction part.
164
+ source: <6a842ef8-b390-4739-9eef-e867d55ed5ea@gmail.com>
165
138
- Update to a new feature recently added, "git show-ref --exists".
139
- source: <20240110141559.387815-2-toon@iotcl.com>
166
+
167
+* rs/parse-options-with-keep-unknown-abbrev-fix (2024-01-22) 2 commits
168
+ (merged to 'next' on 2024-01-23 at a216b482cd)
169
+ + parse-options: simplify positivation handling
170
+ + parse-options: fully disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
171
+
172
+ "git diff --no-rename A B" did not disable rename detection but did
173
+ not trigger an error from the command line parser.
174
+ source: <579fd5bc-3bfd-427f-b22d-dab5e7e56eb2@web.de>
175
+ source: <fb3c679a-5f00-4934-b028-6b2d081cd5b2@web.de>
176
+
177
+
178
+* sd/negotiate-trace-fix (2024-01-03) 1 commit
179
+ (merged to 'next' on 2024-01-24 at 6305853ab2)
180
+ + push: region_leave trace for negotiate_using_fetch
181
+
182
+ Tracing fix.
183
+ source: <20240103224054.1940209-1-delmerico@google.com>
184
+
185
+
186
+* zf/subtree-split-fix (2024-01-25) 1 commit
187
+ (merged to 'next' on 2024-01-26 at a09e02f208)
188
+ + subtree: fix split processing with multiple subtrees present
189
+
190
+ "git subtree" (in contrib/) update.
191
+ source: <pull.1587.v6.git.1701442494319.gitgitgadget@gmail.com>
192
193
--------------------------------------------------
194
[New Topics]
195
196
+* jc/t0091-with-unknown-git (2024-01-30) 1 commit
197
+ (merged to 'next' on 2024-01-31 at 3dfcad1b18)
198
+ + t0091: allow test in a repository without tags
199
+
200
+ The test did not work when Git was built from a repository without
201
+ tags.
202
+
203
+ Will merge to 'master'.
204
+ source: <xmqqv87aabk3.fsf@gitster.g>
205
+
206
+
207
+* ps/reftable-backend (2024-02-02) 3 commits
208
+ - ci: add jobs to test with the reftable backend
209
+ - refs: introduce reftable backend
210
+ - Merge branch 'ps/tests-with-ref-files-backend' into ps/reftable-backend
211
+ (this branch uses ps/tests-with-ref-files-backend.)
212
+
213
+ Integrate the reftable code into the refs framework as a backend.
214
+
215
+ Needs review.
216
+ source: <cover.1706862705.git.ps@pks.im>
217
+
218
+
219
+* js/win32-retry-pipe-write-on-enospc (2024-01-30) 1 commit
220
+ (merged to 'next' on 2024-01-31 at 60ad589fd0)
221
+ + win32: special-case `ENOSPC` when writing to a pipe
222
+
223
+ Update to the code that writes to pipes on Windows.
224
+
225
+ Will merge to 'master'.
226
+ source: <pull.1648.git.1706650619950.gitgitgadget@gmail.com>
227
+
228
+
229
+* jc/make-libpath-template (2024-01-31) 2 commits
230
+ (merged to 'next' on 2024-01-31 at 559d5138bc)
231
+ + Makefile: simplify output of the libpath_template
232
+ + Makefile: reduce repetitive library paths
233
+
234
+ The Makefile often had to say "-L$(path) -R$(path)" that repeats
235
+ the path to the same library directory for link time and runtime.
236
+ A Makefile template is used to reduce such repetition.
237
+
238
+ Will merge to 'master'.
239
+ source: <20240131174220.4160560-1-gitster@pobox.com>
240
+
241
+
242
+* cb/use-freebsd-13-2-at-cirrus-ci (2024-01-31) 1 commit
243
+ (merged to 'next' on 2024-01-31 at f89dc8a289)
244
+ + ci: update FreeBSD cirrus job
245
+
246
+ Cirrus CI jobs started breaking because we specified version of
247
+ FreeBSD that is no longer available, which has been corrected.
248
+
249
+ Will merge to 'master'.
250
+ source: <20240131191325.33228-1-carenas@gmail.com>
251
+
252
+
253
+* cc/rev-list-allow-missing-tips (2024-02-01) 3 commits
254
+ - rev-list: add --allow-missing-tips to be used with --missing=...
255
+ - t6022: fix 'even though' typo in comment
256
+ - revision: clarify a 'return NULL' in get_reference()
257
+
258
+ "git rev-list --missing=print" have learned to optionally take
259
+ "--allow-missing-tips", which allows the objects at the starting
260
+ points to be missing.
261
+
262
+ Needs review.
263
+ source: <20240201115809.1177064-1-christian.couder@gmail.com>
264
+
265
+
266
+* ps/reftable-iteration-perf (2024-02-01) 7 commits
267
+ - reftable/reader: add comments to `table_iter_next()`
268
+ - reftable/record: don't try to reallocate ref record name
269
+ - reftable/block: swap buffers instead of copying
270
+ - reftable/pq: allocation-less comparison of entry keys
271
+ - reftable/merged: skip comparison for records of the same subiter
272
+ - reftable/merged: allocation-less dropping of shadowed records
273
+ - reftable/record: introduce function to compare records by key
274
+
275
+ The code to iterate over refs with the reftable backend has seen
276
+ some optimization.
277
+
278
+ Needs review.
279
+ source: <cover.1706782841.git.ps@pks.im>
280
+
281
+
282
+* ps/reftable-styles (2024-02-01) 9 commits
283
+ - reftable/record: improve semantics when initializing records
284
+ - reftable/merged: refactor initialization of iterators
285
+ - reftable/merged: refactor seeking of records
286
+ - reftable/stack: use `size_t` to track stack length
287
+ - reftable/stack: use `size_t` to track stack slices during compaction
288
+ - reftable/stack: index segments with `size_t`
289
+ - reftable/stack: fix parameter validation when compacting range
290
+ - reftable: introduce macros to allocate arrays
291
+ - reftable: introduce macros to grow arrays
292
+
293
+ Code clean-up in various reftable code paths.
294
+
295
+ Needs review.
296
+ source: <cover.1706772591.git.ps@pks.im>
297
+
298
+
299
+* pb/imap-send-wo-curl-build-fix (2024-02-01) 1 commit
300
+ - imap-send: add missing "strbuf.h" include under NO_CURL
301
+
302
+ Build fix.
303
+
304
+ Will merge to 'next'.
305
+ source: <pull.1664.git.git.1706833113569.gitgitgadget@gmail.com>
306
+
307
+
308
+* jc/github-actions-update (2024-02-02) 1 commit
309
+ - Merge branch 'jc/maint-github-actions-update' into jc/github-actions-update
310
+ (this branch uses jc/maint-github-actions-update.)
311
+
312
+ An evil merge of the other topic to a more modern codebase.
313
+
314
+ Will merge to 'next'?
315
+
316
+
317
+* jc/maint-github-actions-update (2024-02-02) 2 commits
318
+ - GitHub Actions: update to github-script@v7
319
+ - GitHub Actions: update to checkout@v4
320
+ (this branch is used by jc/github-actions-update.)
321
+
322
+ Squelch node.js 16 deprecation warnings from GitHub Actions CI
323
+ by updating actions/github-script and actions/checkout that use
324
+ node.js 20.
325
+
326
+ Needs review.
327
+ source: <20240202203935.1240458-1-gitster@pobox.com>
328
+
329
+
330
+* jh/sparse-index-expand-to-path-fix (2024-02-02) 1 commit
331
+ - sparse-index: pass string length to index_file_exists()
332
+
333
+ A caller called index_file_exists() that takes a string expressed
334
+ as <ptr, length> with a wrong length, which has been corrected.
335
+
336
+ Will merge to 'next'.
337
+ source: <pull.1649.git.1706897095273.gitgitgadget@gmail.com>
338
+
339
+--------------------------------------------------
340
+[Cooking]
341
+
342
* jc/comment-style-fixes (2024-01-29) 3 commits
145
- - reftable/pq_test: comment style fix
146
- - merge-ort.c: comment style fix
147
- - builtin/worktree: comment style fixes
343
+ (merged to 'next' on 2024-01-30 at a58d48a9ce)
344
+ + reftable/pq_test: comment style fix
345
+ + merge-ort.c: comment style fix
346
+ + builtin/worktree: comment style fixes
347
348
Rewrite //-comments to /* comments */ in files whose comments
349
prevalently use the latter.
350
152
- Will merge to 'next'.
351
+ Will merge to 'master'.
352
source: <20240129202839.2234084-1-gitster@pobox.com>
353
354
355
* jk/diff-external-with-no-index (2024-01-29) 1 commit
157
- - diff: handle NULL meta-info when spawning external diff
356
+ (merged to 'next' on 2024-01-30 at 30c3e9f91d)
357
+ + diff: handle NULL meta-info when spawning external diff
358
359
"git diff --no-index file1 file2" segfaulted while invoking the
360
external diff driver, which has been corrected.
361
162
- Will merge to 'next'.
362
+ Reverted out of 'next' for now, seems to break "win test (n)" jobs.
363
+ cf. <xmqqh6irwtkd.fsf@gitster.g>
364
source: <20240129015708.GA1762343@coredump.intra.peff.net>
365
366
166
-* jk/unit-tests-buildfix (2024-01-29) 2 commits
167
- - t/Makefile: get UNIT_TESTS list from C sources
168
- - Makefile: use order-only prereq for UNIT_TEST_BIN
367
+* jk/unit-tests-buildfix (2024-01-31) 3 commits
368
+ (merged to 'next' on 2024-01-31 at 00df31c4c8)
369
+ + t/Makefile: get UNIT_TESTS list from C sources
370
+ + Makefile: remove UNIT_TEST_BIN directory with "make clean"
371
+ + Makefile: use mkdir_p_parent_template for UNIT_TEST_BIN
372
170
- Build dependency fix around unit tests.
373
+ Build dependency around unit tests has been fixed.
374
172
- Expecting a reroll.
173
- cf. <20240129202201.GA9612@szeder.dev>
174
- source: <20240129031540.GA2433764@coredump.intra.peff.net>
375
+ Will merge to 'master'.
376
+ source: <20240130053714.GA165967@coredump.intra.peff.net>
377
378
379
* js/merge-tree-3-trees (2024-01-29) 1 commit
178
- - merge-tree: accept 3 trees as arguments
380
+ (merged to 'next' on 2024-01-30 at 0c77b04e59)
381
+ + merge-tree: accept 3 trees as arguments
382
383
"git merge-tree" has learned that the three trees involved in the
384
3-way merge only need to be trees, not necessarily commits.
385
183
- Will merge to 'next'.
386
+ Will merge to 'master'.
387
source: <pull.1647.v2.git.1706474063109.gitgitgadget@gmail.com>
388
389
390
* jt/p4-spell-re-with-raw-string (2024-01-29) 1 commit
188
- - git-p4: use raw string literals for regular expressions
391
+ (merged to 'next' on 2024-01-30 at 42b03b58eb)
392
+ + git-p4: use raw string literals for regular expressions
393
394
"git p4" update to squelch warnings from Python.
395
192
- Will merge to 'next'.
396
+ Will merge to 'master'.
397
source: <pull.1639.v2.git.1706312496608.gitgitgadget@gmail.com>
398
399
400
* kh/maintenance-use-xdg-when-it-should (2024-01-29) 1 commit
197
- - config: add back code comment
401
+ (merged to 'next' on 2024-01-30 at c449ac74bf)
402
+ + config: add back code comment
403
404
Comment fix.
405
201
- Will merge to 'next'.
406
+ Will merge to 'master'.
407
source: <48d66e94ece3b763acbe933561d82157c02a5f58.1706466321.git.code@khaugsbakk.name>
408
409
@@ -208,7 +413,7 @@ Release tarballs are available at:
413
Teach wincred credential backend to support oauth refresh token the
414
same way as credential-cache and credential-libsecret backends.
415
211
- Needs review.
416
+ Will merge to 'next'.
417
source: <pull.1534.v3.git.1706477103039.gitgitgadget@gmail.com>
418
419
@@ -240,59 +445,26 @@ Release tarballs are available at:
445
446
447
* rj/test-with-leak-check (2024-01-29) 4 commits
243
- - t0080: mark as leak-free
244
- - test-lib: check for TEST_PASSES_SANITIZE_LEAK
245
- - t6113: mark as leak-free
246
- - t5332: mark as leak-free
448
+ (merged to 'next' on 2024-01-31 at 76e4596666)
449
+ + t0080: mark as leak-free
450
+ + test-lib: check for TEST_PASSES_SANITIZE_LEAK
451
+ + t6113: mark as leak-free
452
+ + t5332: mark as leak-free
453
248
- Mark tests that are supposed to pass leak sanitizer as such.
454
+ More tests that are supposed to pass leak sanitizer are marked as such.
455
250
- Will merge to 'next'?
456
+ Will merge to 'master'.
457
source: <45eb0748-6415-4e52-a54f-8d4e5ad57dde@gmail.com>
458
459
460
* tb/pack-bitmap-drop-unused-struct-member (2024-01-29) 1 commit
255
- - pack-bitmap: drop unused `reuse_objects`
461
+ (merged to 'next' on 2024-01-30 at f3749b15fc)
462
+ + pack-bitmap: drop unused `reuse_objects`
463
464
Code clean-up.
465
259
- Will merge to 'next'.
260
- source: <0bbaf9a3591765161872fb71383263edb0c7ef83.1706328008.git.me@ttaylorr.com>
261
-
262
---------------------------------------------------
263
-[Cooking]
264
-
265
-* jc/coc-whitespace-fix (2024-01-23) 1 commit
266
- (merged to 'next' on 2024-01-26 at 6fb290ad59)
267
- + CoC: whitespace fix
268
-
269
- Docfix.
270
-
271
- Will merge to 'master'.
272
- source: <xmqqmssvnb8d.fsf_-_@gitster.g>
273
-
274
-
275
-* jc/ls-files-doc-update (2024-01-25) 1 commit
276
- (merged to 'next' on 2024-01-26 at a71aeec3d3)
277
- + ls-files: avoid the verb "deprecate" for individual options
278
-
279
- The documentation for the --exclude-per-directory option marked it
280
- as deprecated, which confused readers into thinking there may be a
281
- plan to remove it in the future, which was not our intention.
282
-
466
Will merge to 'master'.
284
- source: <xmqqjznybfp4.fsf@gitster.g>
285
-
286
-
287
-* jk/fetch-auto-tag-following-fix (2024-01-24) 1 commit
288
- (merged to 'next' on 2024-01-26 at d058f1511b)
289
- + transport-helper: re-examine object dir after fetching
290
-
291
- Fetching via protocol v0 over Smart HTTP transport sometimes failed
292
- to correctly auto-follow tags.
293
-
294
- Will merge to 'master'.
295
- source: <20240124010056.GA2603087@coredump.intra.peff.net>
467
+ source: <0bbaf9a3591765161872fb71383263edb0c7ef83.1706328008.git.me@ttaylorr.com>
468
469
470
* ps/reftable-compacted-tables-permission-fix (2024-01-26) 1 commit
@@ -305,29 +477,19 @@ Release tarballs are available at:
477
source: <a211818108053754aca002726d0206623a347952.1706263589.git.ps@pks.im>
478
479
308
-* jc/index-pack-fsck-levels (2024-01-26) 2 commits
309
- - index-pack: --fsck-objects to take an optional argument for fsck msgs
310
- - index-pack: test and document --strict=<msg-id>=<severity>...
480
+* jc/index-pack-fsck-levels (2024-02-01) 2 commits
481
+ (merged to 'next' on 2024-02-02 at 0e4ef26aa1)
482
+ + index-pack: --fsck-objects to take an optional argument for fsck msgs
483
+ + index-pack: test and document --strict=<msg-id>=<severity>...
484
485
The "--fsck-objects" option of "git index-pack" now can take the
486
optional parameter to tweak severity of different fsck errors.
487
315
- Expecting a reroll.
316
- cf. <BF772E83-2BFE-4652-A742-67FADF3D8FE2@gmail.com>
317
- source: <pull.1658.v3.git.git.1706302749.gitgitgadget@gmail.com>
318
-
319
-
320
-* zf/subtree-split-fix (2024-01-25) 1 commit
321
- (merged to 'next' on 2024-01-26 at a09e02f208)
322
- + subtree: fix split processing with multiple subtrees present
323
-
324
- "git subtree" (in contrib/) update.
325
-
488
Will merge to 'master'.
327
- source: <pull.1587.v6.git.1701442494319.gitgitgadget@gmail.com>
489
+ source: <pull.1658.v4.git.git.1706751483.gitgitgadget@gmail.com>
490
491
330
-* ps/reftable-multi-level-indices-fix (2024-01-26) 6 commits
492
+* ps/reftable-multi-level-indices-fix (2024-02-01) 6 commits
493
- reftable: document reading and writing indices
494
- reftable/writer: fix writing multi-level indices
495
- reftable/writer: simplify writing index records
@@ -337,61 +499,14 @@ Release tarballs are available at:
499
(this branch uses jc/reftable-core-fsync.)
500
501
Write multi-level indices for reftable has been corrected.
340
- source: <cover.1706263918.git.ps@pks.im>
502
342
-
343
-* kl/allow-working-in-dot-git-in-non-bare-repository (2024-01-20) 1 commit
344
- (merged to 'next' on 2024-01-24 at e77b796e11)
345
- + setup: allow cwd=.git w/ bareRepository=explicit
346
-
347
- Loosen "disable repository discovery of a bare repository" check,
348
- triggered by setting safe.bareRepository configuration variable to
349
- 'explicit', to exclude the ".git/" directory inside a non-bare
350
- repository from the check.
351
-
352
- Will merge to 'master'.
353
- source: <pull.1645.git.1705709303098.gitgitgadget@gmail.com>
354
-
355
-
356
-* rs/parse-options-with-keep-unknown-abbrev-fix (2024-01-22) 2 commits
357
- (merged to 'next' on 2024-01-23 at a216b482cd)
358
- + parse-options: simplify positivation handling
359
- + parse-options: fully disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
360
-
361
- "git diff --no-rename A B" did not disable rename detection but did
362
- not trigger an error from the command line parser.
363
-
364
- Will merge to 'master'.
365
- source: <579fd5bc-3bfd-427f-b22d-dab5e7e56eb2@web.de>
366
- source: <fb3c679a-5f00-4934-b028-6b2d081cd5b2@web.de>
367
-
368
-
369
-* pb/ci-github-skip-logs-for-broken-tests (2024-01-22) 1 commit
370
- (merged to 'next' on 2024-01-23 at f5e3ab2092)
371
- + ci(github): also skip logs of broken test cases
372
-
373
- GitHub CI update.
374
-
375
- Will merge to 'master'.
376
- cf. <dbe25fff-e1d4-41f2-8f8f-c538e8c2a77e@github.com>
377
- source: <pull.1649.git.git.1705808313306.gitgitgadget@gmail.com>
378
-
379
-
380
-* pb/complete-log-more (2024-01-22) 4 commits
381
- (merged to 'next' on 2024-01-24 at 081d2a92fa)
382
- + completion: complete missing 'git log' options
383
- + completion: complete --encoding
384
- + completion: complete --patch-with-raw
385
- + completion: complete missing rev-list options
386
-
387
- The completion script (in contrib/) learned more options that can
388
- be used with "git log".
389
-
390
- Will merge to 'master'.
391
- source: <pull.1650.git.git.1705810071.gitgitgadget@gmail.com>
503
+ Needs review.
504
+ source: <cover.1706773842.git.ps@pks.im>
505
506
394
-* jc/reftable-core-fsync (2024-01-23) 1 commit
507
+* jc/reftable-core-fsync (2024-01-30) 2 commits
508
+ (merged to 'next' on 2024-01-30 at c3a79b6172)
509
+ + reftable/stack: fsync "tables.list" during compaction
510
(merged to 'next' on 2024-01-24 at cea12beddb)
511
+ reftable: honor core.fsync
512
(this branch is used by ps/reftable-multi-level-indices-fix.)
@@ -400,48 +515,17 @@ Release tarballs are available at:
515
core.fsync configuration.
516
517
Will merge to 'master'.
403
- source: <pull.1654.git.git.1706035870956.gitgitgadget@gmail.com>
404
-
405
-
406
-* ad/custom-merge-placeholder-for-symbolic-pathnames (2024-01-24) 1 commit
407
- (merged to 'next' on 2024-01-24 at d9cf4e227d)
408
- + merge-ll: expose revision names to custom drivers
409
-
410
- The labels on conflict markers for the common ancestor, our version,
411
- and the other version are available to custom 3-way merge driver
412
- via %S, %X, and %Y placeholders.
413
-
414
- Will merge to 'master'.
415
- source: <pull.1648.v4.git.git.1706126951879.gitgitgadget@gmail.com>
518
+ source: <7bdafc9bd7f53f38a24d69a563615b6ad484e1ba.1706592127.git.ps@pks.im>
519
520
521
* cp/unit-test-prio-queue (2024-01-22) 1 commit
419
- - tests: move t0009-prio-queue.sh to the new unit testing framework
522
+ (merged to 'next' on 2024-02-01 at 38aa6559b0)
523
+ + tests: move t0009-prio-queue.sh to the new unit testing framework
524
525
Migrate priority queue test to unit testing framework.
422
- source: <pull.1642.v4.git.1705865326185.gitgitgadget@gmail.com>
423
-
424
-
425
-* jc/reffiles-tests (2024-01-22) 12 commits
426
- (merged to 'next' on 2024-01-24 at 0d1aaa6807)
427
- + t5312: move reffiles specific tests to t0601
428
- + t4202: move reffiles specific tests to t0600
429
- + t3903: make drop stash test ref backend agnostic
430
- + t1503: move reffiles specific tests to t0600
431
- + t1415: move reffiles specific tests to t0601
432
- + t1410: move reffiles specific tests to t0600
433
- + t1406: move reffiles specific tests to t0600
434
- + t1405: move reffiles specific tests to t0601
435
- + t1404: move reffiles specific tests to t0600
436
- + t1414: convert test to use Git commands instead of writing refs manually
437
- + remove REFFILES prerequisite for some tests in t1405 and t2017
438
- + t3210: move to t0601
439
-
440
- Tests on ref API are moved around to prepare for reftable.
526
527
Will merge to 'master'.
443
- cf. <Za5TW-q4cKS8pNNc@tanuki>
444
- source: <pull.1647.v2.git.git.1705695540.gitgitgadget@gmail.com>
528
+ source: <pull.1642.v4.git.1705865326185.gitgitgadget@gmail.com>
529
530
531
* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-01-17) 2 commits
@@ -456,20 +540,22 @@ Release tarballs are available at:
540
541
542
* kn/for-all-refs (2024-01-29) 4 commits
459
- - for-each-ref: avoid filtering on empty pattern
460
- - refs: introduce `refs_for_each_all_refs()`
461
- - refs: extract out `loose_fill_ref_dir_regular_file()`
462
- - refs: introduce `is_pseudoref()` and `is_headref()`
543
+ (merged to 'next' on 2024-01-30 at e7a9234a8b)
544
+ + for-each-ref: avoid filtering on empty pattern
545
+ + refs: introduce `refs_for_each_all_refs()`
546
+ + refs: extract out `loose_fill_ref_dir_regular_file()`
547
+ + refs: introduce `is_pseudoref()` and `is_headref()`
548
549
"git for-each-ref" filters its output with prefixes given from the
550
command line, but it did not honor an empty string to mean "pass
551
everything", which has been corrected.
552
468
- Will merge to 'next'.
553
+ Will merge to 'master'.
554
source: <20240129113527.607022-1-karthik.188@gmail.com>
555
556
472
-* bk/complete-bisect (2024-01-29) 8 commits
557
+* bk/complete-bisect (2024-01-29) 9 commits
558
+ - SQUASH???
559
- completion: add tests for git-bisect
560
- completion: bisect: recognize but do not complete view subcommand
561
- completion: bisect: complete log opts for visualize subcommand
@@ -509,61 +595,40 @@ Release tarballs are available at:
595
source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com>
596
597
512
-* la/trailer-api (2024-01-26) 10 commits
598
+* la/trailer-api (2024-01-30) 10 commits
599
+ - trailer: introduce "template" term for readability
600
- trailer: delete obsolete argument handling code from API
601
- trailer: move arg handling to interpret-trailers.c
515
- - trailer: prepare to move parse_trailers_from_command_line_args () to builtin
602
+ - trailer: prepare to move parse_trailers_from_command_line_args() to builtin
603
- trailer: spread usage of "trailer_block" language
604
- trailer: make trailer_info struct private
605
- sequencer: use the trailer iterator
519
- - trailer: delete obsolete formatting functions
606
- trailer: unify trailer formatting machinery
607
- trailer: move interpret_trailers() to interpret-trailers.c
608
- trailer: prepare to expose functions as part of API
609
610
Code clean-up.
611
526
- Expecting a (hopefully final and small) reroll.
527
- cf. <owlyh6iy2grk.fsf@fine.c.googlers.com>
528
- source: <pull.1632.v2.git.1706308737.gitgitgadget@gmail.com>
612
+ Needs review.
613
+ cf. <xmqqa5ol409k.fsf@gitster.g>
614
+ source: <pull.1632.v3.git.1706664144.gitgitgadget@gmail.com>
615
616
617
* ps/tests-with-ref-files-backend (2024-01-29) 6 commits
532
- - t: mark tests regarding git-pack-refs(1) to be backend specific
533
- - t5526: break test submodule differently
534
- - t1419: mark test suite as files-backend specific
535
- - t1302: make tests more robust with new extensions
536
- - t1301: mark test for `core.sharedRepository` as reffiles specific
537
- - t1300: make tests more robust with non-default ref backends
618
+ (merged to 'next' on 2024-01-30 at 376b9c9c1b)
619
+ + t: mark tests regarding git-pack-refs(1) to be backend specific
620
+ + t5526: break test submodule differently
621
+ + t1419: mark test suite as files-backend specific
622
+ + t1302: make tests more robust with new extensions
623
+ + t1301: mark test for `core.sharedRepository` as reffiles specific
624
+ + t1300: make tests more robust with non-default ref backends
625
+ (this branch is used by ps/reftable-backend.)
626
627
Prepare existing tests on refs to work better with non-default
628
backends.
629
542
- Will merge to 'next'.
543
- source: <cover.1706525813.git.ps@pks.im>
544
-
545
-
546
-* rj/advice-disable-how-to-disable (2024-01-16) 2 commits
547
- (merged to 'next' on 2024-01-23 at f456f4937d)
548
- + advice: allow disabling the automatic hint in advise_if_enabled()
549
- + Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how-to-disable
550
-
551
- All conditional "advice" messages show how to turn them off, which
552
- becomes repetitive. Add a configuration variable to omit the
553
- instruction.
554
-
630
Will merge to 'master'.
556
- source: <6a842ef8-b390-4739-9eef-e867d55ed5ea@gmail.com>
557
-
558
-
559
-* sd/negotiate-trace-fix (2024-01-03) 1 commit
560
- (merged to 'next' on 2024-01-24 at 6305853ab2)
561
- + push: region_leave trace for negotiate_using_fetch
562
-
563
- Tracing fix.
564
-
565
- Will merge to 'master'.
566
- source: <20240103224054.1940209-1-delmerico@google.com>
631
+ source: <cover.1706525813.git.ps@pks.im>
632
633
634
* cp/apply-core-filemode (2023-12-26) 3 commits
@@ -587,7 +652,7 @@ Release tarballs are available at:
652
653
Docfix.
654
590
- Needs review.
655
+ Will merge to 'next'.
656
source: <pull.1626.git.1703539287.gitgitgadget@gmail.com>
657
658
@@ -616,15 +681,14 @@ Release tarballs are available at:
681
source: <cover.1699569246.git.me@ttaylorr.com>
682
683
619
-* tb/path-filter-fix (2024-01-16) 17 commits
684
+* tb/path-filter-fix (2024-01-31) 16 commits
685
- bloom: introduce `deinit_bloom_filters()`
686
- commit-graph: reuse existing Bloom filters where possible
687
- object.h: fix mis-aligned flag bits table
623
- - commit-graph: drop unnecessary `graph_read_bloom_data_context`
624
- - commit-graph.c: unconditionally load Bloom filters
688
+ - commit-graph: new Bloom filter version that fixes murmur3
689
+ - commit-graph: unconditionally load Bloom filters
690
- bloom: prepare to discard incompatible Bloom filters
691
- bloom: annotate filters with hash version
627
- - commit-graph: new Bloom filter version that fixes murmur3
692
- repo-settings: introduce commitgraph.changedPathsVersion
693
- t4216: test changed path filters with high bit paths
694
- t/helper/test-read-graph: implement `bloom-filters` mode
@@ -638,10 +702,7 @@ Release tarballs are available at:
702
The Bloom filter used for path limited history traversal was broken
703
on systems whose "char" is unsigned; update the implementation and
704
bump the format version to 2.
641
-
642
- Expecting a reroll.
643
- cf. <20240129212614.GB9612@szeder.dev>
644
- source: <cover.1705442923.git.me@ttaylorr.com>
705
+ source: <cover.1706741516.git.me@ttaylorr.com>
706
707
708
* ak/color-decorate-symbols (2023-10-23) 7 commits
@@ -697,22 +758,6 @@ Release tarballs are available at:
758
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
759
760
700
-* jx/remote-archive-over-smart-http (2024-01-22) 6 commits
701
- (merged to 'next' on 2024-01-23 at 5fa4633015)
702
- + transport-helper: call do_take_over() in process_connect
703
- + transport-helper: call do_take_over() in connect_helper
704
- + http-backend: new rpc-service for git-upload-archive
705
- + transport-helper: protocol v2 supports upload-archive
706
- + remote-curl: supports git-upload-archive service
707
- + transport-helper: no connection restriction in connect_helper
708
-
709
- "git archive --remote=<remote>" learned to talk over the smart
710
- http (aka stateless) transport.
711
-
712
- Will merge to 'master'.
713
- source: <cover.1705841443.git.zhiyou.jx@alibaba-inc.com>
714
-
715
-
761
* jc/rerere-cleanup (2023-08-25) 4 commits
762
- rerere: modernize use of empty strbuf
763
- rerere: try_merge() should use LL_MERGE_ERROR when it means an error