What's cooking (2024/01 #06)
Junio C Hamano committed
Jan 19, 2024 at 17:05 UTC
e07100009d5edd1685cfe871882c108969fd6832
1 file changed
+247
-303
whats-cooking.txt
+247
-303
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2024, #05; Tue, 16)
3
-X-master-at: 186b115d3062e6230ee296d1ddaa0c4b72a464b5
4
-X-next-at: 8c6e9c07ef0bd922be435c0763b0b1b5bc508796
2
+Subject: What's cooking in git.git (Jan 2024, #06; Fri, 19)
3
+X-master-at: e02ecfcc534e2021aae29077a958dd11c3897e4c
4
+X-next-at: 4ca1e1f3c373c10320a345031bbeadd1413955dc
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2024, #05; Tue, 16)
7
+What's cooking in git.git (Jan 2024, #06; Fri, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,183 +48,202 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* cp/git-flush-is-an-env-bool (2024-01-04) 1 commit
52
- (merged to 'next' on 2024-01-04 at b435a96ce8)
53
- + write-or-die: make GIT_FLUSH a Boolean environment variable
51
+* bk/bisect-doc-fix (2024-01-10) 2 commits
52
+ (merged to 'next' on 2024-01-12 at bdb3609554)
53
+ + doc: refer to pathspec instead of path
54
+ + doc: use singular form of repeatable path arg
55
+
56
+ Synopsis fix.
57
+ source: <20240103040207.661413-1-britton.kerin@gmail.com>
58
+
59
+
60
+* cp/t4129-pipefix (2024-01-10) 1 commit
61
+ (merged to 'next' on 2024-01-12 at fd9b72b71a)
62
+ + t4129: prevent loss of exit code due to the use of pipes
63
+
64
+ Test update.
65
+ source: <pull.1636.git.1704891257544.gitgitgadget@gmail.com>
66
+
67
+
68
+* ps/gitlab-ci-static-analysis (2024-01-08) 1 commit
69
+ (merged to 'next' on 2024-01-10 at 71af34de07)
70
+ + ci: add job performing static analysis on GitLab CI
71
+ (this branch is used by ps/gitlab-ci-macos.)
72
+
73
+ GitLab CI update.
74
+ source: <1536a5ef07ad24dafb5d685b40099882f89e6cc5.1703761005.git.ps@pks.im>
75
+
76
+
77
+* ps/p4-use-ref-api (2024-01-11) 1 commit
78
+ (merged to 'next' on 2024-01-12 at 3f89cf25f6)
79
+ + git-p4: stop reaching into the refdb
80
55
- Unlike other environment variables that took the usual
56
- true/false/yes/no as well as 0/1, GIT_FLUSH only understood 0/1,
57
- which has been corrected.
58
- source: <pull.1628.v3.git.1704363617842.gitgitgadget@gmail.com>
81
+ "git p4" update to prepare for reftable
82
+ source: <33d6a062ec56be33ed50a42a420be0b023f6f4cf.1704980814.git.ps@pks.im>
83
84
61
-* cp/sideband-array-index-comment-fix (2023-12-28) 1 commit
62
- (merged to 'next' on 2024-01-08 at f906bc86f1)
63
- + sideband.c: remove redundant 'NEEDSWORK' tag
85
+* ps/prompt-parse-HEAD-futureproof (2024-01-08) 2 commits
86
+ (merged to 'next' on 2024-01-10 at f9515b9d89)
87
+ + git-prompt: stop manually parsing HEAD with unknown ref formats
88
+ + Merge branch 'ps/refstorage-extension' into ps/prompt-parse-HEAD-futureproof
89
65
- In-code comment fix.
66
- source: <pull.1625.v4.git.1703750460527.gitgitgadget@gmail.com>
90
+ Futureproof command line prompt support (in contrib/).
91
+ source: <ef4e36a5a40c369da138242a8fdc9e12a846613b.1704356313.git.ps@pks.im>
92
93
69
-* ib/rebase-reschedule-doc (2024-01-05) 1 commit
70
- (merged to 'next' on 2024-01-08 at d451d1f760)
71
- + rebase: clarify --reschedule-failed-exec default
94
+* rj/clarify-branch-doc-m (2024-01-08) 1 commit
95
+ (merged to 'next' on 2024-01-10 at 432eaa2c6b)
96
+ + branch: clarify <oldbranch> term
97
98
Doc update.
74
- source: <20240105011424.1443732-2-illia.bobyr@gmail.com>
99
+ source: <d38e5a18-4d85-48f3-bc8b-8ca02ea683a4@gmail.com>
100
101
77
-* jk/commit-graph-slab-clear-fix (2024-01-05) 1 commit
78
- (merged to 'next' on 2024-01-08 at f78c4fc296)
79
- + commit-graph: retain commit slab when closing NULL commit_graph
102
+* sk/mingw-owner-check-error-message-improvement (2024-01-10) 1 commit
103
+ (merged to 'next' on 2024-01-12 at 05c56e151b)
104
+ + mingw: give more details about unsafe directory's ownership
105
81
- Clearing in-core repository (happens during e.g., "git fetch
82
- --recurse-submodules" with commit graph enabled) made in-core
83
- commit object in an inconsistent state by discarding the necessary
84
- data from commit-graph too early, which has been corrected.
85
- source: <20240105054142.GA2035092@coredump.intra.peff.net>
106
+ In addition to (rather cryptic) Security Identifiers, show username
107
+ and domain in the error message when we barf on mismatch between
108
+ the Git directory and the current user on Windows.
109
+ source: <20240108173837.20480-2-soekkle@freenet.de>
110
111
88
-* jk/index-pack-lsan-false-positive-fix (2024-01-05) 1 commit
89
- (merged to 'next' on 2024-01-08 at 589ed65251)
90
- + index-pack: spawn threads atomically
112
+* tb/fetch-all-configuration (2024-01-08) 1 commit
113
+ (merged to 'next' on 2024-01-12 at 6a05050382)
114
+ + fetch: add new config option fetch.all
115
92
- Fix false positive reported by leak sanitizer.
93
- source: <20240105085034.GA3078476@coredump.intra.peff.net>
116
+ "git fetch" learned to pay attention to "fetch.all" configuration
117
+ variable, which pretends as if "--all" was passed from the command
118
+ line when no remote parameter was given.
119
+ source: <20240108211832.47362-1-dev@tb6.eu>
120
121
+--------------------------------------------------
122
+[New Topics]
123
96
-* jk/t1006-cat-file-objectsize-disk (2024-01-03) 2 commits
97
- (merged to 'next' on 2024-01-03 at a492c6355c)
98
- + t1006: prefer shell loop to awk for packed object sizes
99
- (merged to 'next' on 2023-12-28 at d82812e636)
100
- + t1006: add tests for %(objectsize:disk)
124
+* kh/maintenance-use-xdg-when-it-should (2024-01-18) 4 commits
125
+ (merged to 'next' on 2024-01-19 at 9c8c7b2e9d)
126
+ + maintenance: use XDG config if it exists
127
+ + config: factor out global config file retrieval
128
+ + config: rename global config function
129
+ + config: format newlines
130
102
- Test update.
103
- source: <20231221094722.GA570888@coredump.intra.peff.net>
104
- source: <20240103090152.GB1866508@coredump.intra.peff.net>
105
-
106
-
107
-* js/contributor-docs-updates (2023-12-27) 9 commits
108
- (merged to 'next' on 2024-01-02 at 0e072117cd)
109
- + SubmittingPatches: hyphenate non-ASCII
110
- + SubmittingPatches: clarify GitHub artifact format
111
- + SubmittingPatches: clarify GitHub visual
112
- + SubmittingPatches: provide tag naming advice
113
- + SubmittingPatches: update extra tags list
114
- + SubmittingPatches: discourage new trailers
115
- + SubmittingPatches: drop ref to "What's in git.git"
116
- + CodingGuidelines: write punctuation marks
117
- + CodingGuidelines: move period inside parentheses
131
+ When $HOME/.gitignore is missing but XDG config file available, we
132
+ should write into the latter, not former. "git gc" and "git
133
+ maintenance" wrote into a wrong "global config" file, which have
134
+ been corrected.
135
119
- Doc update.
120
- source: <pull.1623.v3.git.1703739324.gitgitgadget@gmail.com>
136
+ Will merge to 'master'.
137
+ source: <cover.1705593810.git.code@khaugsbakk.name>
138
139
123
-* jw/builtin-objectmode-attr (2023-12-28) 1 commit
124
- (merged to 'next' on 2024-01-02 at 4c3784b3a1)
125
- + attr: add builtin objectmode values support
140
+* ps/gitlab-ci-macos (2024-01-18) 6 commits
141
+ (merged to 'next' on 2024-01-19 at a239dc8140)
142
+ + ci: add macOS jobs to GitLab CI
143
+ + ci: make p4 setup on macOS more robust
144
+ + ci: handle TEST_OUTPUT_DIRECTORY when printing test failures
145
+ + Makefile: detect new Homebrew location for ARM-based Macs
146
+ + t7527: decrease likelihood of racing with fsmonitor daemon
147
+ + Merge branch 'ps/gitlab-ci-static-analysis' into ps/gitlab-ci-macos
148
127
- The builtin_objectmode attribute is populated for each path
128
- without adding anything in .gitattributes files, which would be
129
- useful in magic pathspec, e.g., ":(attr:builtin_objectmode=100755)"
130
- to limit to executables.
131
- cf. <xmqq5y0ssknj.fsf@gitster.g>
132
- source: <20231116054437.2343549-1-jojwang@google.com>
149
+ CI for GitLab learned to drive macOS jobs.
150
151
+ Will merge to 'master'.
152
+ source: <cover.1705573336.git.ps@pks.im>
153
135
-* jx/sideband-chomp-newline-fix (2023-12-18) 3 commits
136
- (merged to 'next' on 2024-01-04 at 1237898a22)
137
- + pkt-line: do not chomp newlines for sideband messages
138
- + pkt-line: memorize sideband fragment in reader
139
- + test-pkt-line: add option parser for unpack-sideband
154
141
- Sideband demultiplexer fixes.
142
- source: <cover.1702823801.git.zhiyou.jx@alibaba-inc.com>
155
+* ad/custom-merge-placeholder-for-symbolic-pathnames (2024-01-18) 1 commit
156
+ - merge-ll: expose revision names to custom drivers
157
158
+ source: <pull.1648.v3.git.git.1705615794307.gitgitgadget@gmail.com>
159
145
-* ms/rebase-insnformat-doc-fix (2024-01-03) 1 commit
146
- (merged to 'next' on 2024-01-04 at d68f2be39b)
147
- + Documentation: fix statement about rebase.instructionFormat
160
149
- Docfix.
150
- source: <pull.1629.git.git.1704305663254.gitgitgadget@gmail.com>
151
-
152
-
153
-* ps/refstorage-extension (2024-01-02) 13 commits
154
- (merged to 'next' on 2024-01-08 at f9a034803b)
155
- + t9500: write "extensions.refstorage" into config
156
- + builtin/clone: introduce `--ref-format=` value flag
157
- + builtin/init: introduce `--ref-format=` value flag
158
- + builtin/rev-parse: introduce `--show-ref-format` flag
159
- + t: introduce GIT_TEST_DEFAULT_REF_FORMAT envvar
160
- + setup: introduce GIT_DEFAULT_REF_FORMAT envvar
161
- + setup: introduce "extensions.refStorage" extension
162
- + setup: set repository's formats on init
163
- + setup: start tracking ref storage format
164
- + refs: refactor logic to look up storage backends
165
- + worktree: skip reading HEAD when repairing worktrees
166
- + t: introduce DEFAULT_REPO_FORMAT prereq
167
- + Merge branch 'ps/clone-into-reftable-repository' into ps/refstorage-extension
168
- (this branch is used by ps/prompt-parse-HEAD-futureproof and ps/worktree-refdb-initialization.)
169
-
170
- Introduce a new extension "refstorage" so that we can mark a
171
- repository that uses a non-default ref backend, like reftable.
172
- source: <cover.1703833818.git.ps@pks.im>
173
-
174
-
175
-* ps/reftable-fixes-and-optims (2024-01-03) 9 commits
176
- (merged to 'next' on 2024-01-08 at 167d7685f8)
177
- + reftable/merged: transfer ownership of records when iterating
178
- + reftable/merged: really reuse buffers to compute record keys
179
- + reftable/record: store "val2" hashes as static arrays
180
- + reftable/record: store "val1" hashes as static arrays
181
- + reftable/record: constify some parts of the interface
182
- + reftable/writer: fix index corruption when writing multiple indices
183
- + reftable/stack: do not auto-compact twice in `reftable_stack_add()`
184
- + reftable/stack: do not overwrite errors when compacting
185
- + Merge branch 'ps/reftable-fixes' into ps/reftable-fixes-and-optims
186
-
187
- More fixes and optimizations to the reftable backend.
188
- source: <cover.1704262787.git.ps@pks.im>
189
-
190
-
191
-* tb/multi-pack-verbatim-reuse (2023-12-14) 26 commits
192
- (merged to 'next' on 2024-01-04 at 891ac0fa2c)
193
- + t/perf: add performance tests for multi-pack reuse
194
- + pack-bitmap: enable reuse from all bitmapped packs
195
- + pack-objects: allow setting `pack.allowPackReuse` to "single"
196
- + t/test-lib-functions.sh: implement `test_trace2_data` helper
197
- + pack-objects: add tracing for various packfile metrics
198
- + pack-bitmap: prepare to mark objects from multiple packs for reuse
199
- + pack-revindex: implement `midx_pair_to_pack_pos()`
200
- + pack-revindex: factor out `midx_key_to_pack_pos()` helper
201
- + midx: implement `midx_preferred_pack()`
202
- + git-compat-util.h: implement checked size_t to uint32_t conversion
203
- + pack-objects: include number of packs reused in output
204
- + pack-objects: prepare `write_reused_pack_verbatim()` for multi-pack reuse
205
- + pack-objects: prepare `write_reused_pack()` for multi-pack reuse
206
- + pack-objects: pass `bitmapped_pack`'s to pack-reuse functions
207
- + pack-objects: keep track of `pack_start` for each reuse pack
208
- + pack-objects: parameterize pack-reuse routines over a single pack
209
- + pack-bitmap: return multiple packs via `reuse_partial_packfile_from_bitmap()`
210
- + pack-bitmap: simplify `reuse_partial_packfile_from_bitmap()` signature
211
- + ewah: implement `bitmap_is_empty()`
212
- + pack-bitmap: pass `bitmapped_pack` struct to pack-reuse functions
213
- + midx: implement `midx_locate_pack()`
214
- + midx: implement `BTMP` chunk
215
- + midx: factor out `fill_pack_info()`
216
- + pack-bitmap: plug leak in find_objects()
217
- + pack-bitmap-write: deep-clear the `bb_commit` slab
218
- + pack-objects: free packing_data in more places
219
-
220
- Streaming spans of packfile data used to be done only from a
221
- single, primary, pack in a repository with multiple packfiles. It
222
- has been extended to allow reuse from other packfiles, too.
223
- cf. <ZXurD1NTZ4TAs7WZ@nand.local>
224
- source: <cover.1702592603.git.me@ttaylorr.com>
161
+* cp/unit-test-prio-queue (2024-01-17) 2 commits
162
+ - SQUASH???
163
+ - tests: move t0009-prio-queue.sh to the new unit testing framework
164
+
165
+ source: <pull.1642.v3.git.1705502304219.gitgitgadget@gmail.com>
166
+
167
+
168
+* jc/reffiles-tests (2024-01-19) 12 commits
169
+ - t5312: move reffiles specific tests to t0601
170
+ - t4202: move reffiles specific tests to t0600
171
+ - t3903: make drop stash test ref backend agnostic
172
+ - t1503: move reffiles specific tests to t0600
173
+ - t1415: move reffiles specific tests to t0601
174
+ - t1410: move reffiles specific tests to t0600
175
+ - t1406: move reffiles specific tests to t0600
176
+ - t1405: move reffiles specific tests to t0601
177
+ - t1404: move reffiles specific tests to t0600
178
+ - t1414: convert test to use Git commands instead of writing refs manually
179
+ - remove REFFILES prerequisite for some tests in t1405 and t2017
180
+ - t3210: move to t0601
181
+
182
+ source: <pull.1647.v2.git.git.1705695540.gitgitgadget@gmail.com>
183
+
184
+
185
+* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-01-17) 2 commits
186
+ - revision: implement `git log --merge` also for rebase/cherry_pick/revert
187
+ - revision: ensure MERGE_HEAD is a ref in prepare_show_merge
188
+
189
+ source: <xmqqzfxa9usx.fsf@gitster.g>
190
+
191
+
192
+* nb/rebase-x-shell-docfix (2024-01-17) 1 commit
193
+ - rebase: fix documentation about used shell in -x
194
+
195
+ source: <20240117085347.948960-1-nik.borisov@suse.com>
196
+
197
+
198
+* tc/show-ref-exists-fix (2024-01-18) 1 commit
199
+ - builtin/show-ref: treat directory as non-existing in --exists
200
+
201
+ source: <20240110141559.387815-2-toon@iotcl.com>
202
+
203
+
204
+* gt/t0024-style-fixes (2024-01-18) 2 commits
205
+ - t0024: style fix
206
+ - t0024: avoid losing exit status to pipes
207
+
208
+ source: <20240118215407.8609-1-shyamthakkar001@gmail.com>
209
+
210
+
211
+* jc/majordomo-to-subspace (2024-01-19) 1 commit
212
+ - Docs: majordomo@vger.kernel.org has been decomissioned
213
+
214
+ source: <xmqqmst1hsd6.fsf@gitster.g>
215
+
216
+
217
+* js/oss-fuzz-build-in-ci (2024-01-19) 2 commits
218
+ - ci: build and run minimal fuzzers in GitHub CI
219
+ - fuzz: fix fuzz test build rules
220
+
221
+ source: <cover.1705700054.git.steadmon@google.com>
222
+
223
+
224
+* kn/for-all-refs (2024-01-19) 5 commits
225
+ - for-each-ref: avoid filtering on empty pattern
226
+ - refs: introduce `refs_for_each_all_refs()`
227
+ - refs: extract out `loose_fill_ref_dir_regular_file()`
228
+ - refs: make `is_pseudoref_syntax()` stricter
229
+ - refs: expose `is_pseudoref_syntax()`
230
+
231
+ source: <20240119142705.139374-1-karthik.188@gmail.com>
232
+
233
+
234
+* ps/not-so-many-refs-are-special (2024-01-19) 7 commits
235
+ - Documentation: add "special refs" to the glossary
236
+ - refs: redefine special refs
237
+ - refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
238
+ - sequencer: introduce functions to handle autostashes via refs
239
+ - refs: convert AUTO_MERGE to become a normal pseudo-ref
240
+ - sequencer: delete REBASE_HEAD in correct repo when picking commits
241
+ - sequencer: clean up pseudo refs with REF_NO_DEREF
242
+
243
+ source: <cover.1705659748.git.ps@pks.im>
244
245
--------------------------------------------------
227
-[New Topics]
246
+[Cooking]
247
248
* es/some-up-to-date-messages-must-stay (2024-01-12) 1 commit
249
(merged to 'next' on 2024-01-16 at 2b598f7de2)
@@ -240,8 +259,8 @@ Release tarballs are available at:
259
source: <20240112171910.11131-1-ericsunshine@charter.net>
260
261
243
-* bk/complete-bisect (2024-01-12) 5 commits
244
- - completion: custom git-bisect terms
262
+* bk/complete-bisect (2024-01-18) 5 commits
263
+ - completion: git-bisect view recognized but not completed
264
- completion: custom git-bisect terms
265
- completion: move to maintain define-before-use
266
- completion: git-log opts to bisect visualize
@@ -250,8 +269,9 @@ Release tarballs are available at:
269
Command line completion support (in contrib/) has been
270
updated for "git bisect".
271
253
- Needs review.
254
- source: <20240110020347.673155-1-britton.kerin@gmail.com>
272
+ Expecting a reroll.
273
+ cf. <ZaofJhHsFjRxx7a3@tanuki>
274
+ source: <20240118204323.1113859-1-britton.kerin@gmail.com>
275
276
277
* bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit
@@ -276,35 +296,37 @@ Release tarballs are available at:
296
source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com>
297
298
279
-* gt/test-commit-o-i-options (2024-01-16) 2 commits
280
- - t7501: add tests for --amend --signoff
281
- - t7501: add tests for --include and --only
299
+* gt/test-commit-o-i-options (2024-01-17) 2 commits
300
+ (merged to 'next' on 2024-01-19 at 0377e2c148)
301
+ + t7501: add tests for --amend --signoff
302
+ + t7501: add tests for --include and --only
303
304
A few tests to "git commit -o <pathspec>" and "git commit -i
305
<pathspec>" has been added.
306
286
- Expecting a reroll.
287
- cf. <xmqq1qah46i0.fsf@gitster.g>
288
- source: <20240113042254.38602-1-shyamthakkar001@gmail.com>
307
+ Will merge to 'master'.
308
+ source: <20240117161421.17333-1-shyamthakkar001@gmail.com>
309
310
311
* jt/tests-with-reftable (2024-01-12) 2 commits
292
- - t5541: remove lockfile creation
293
- - t1401: remove lockfile creation
312
+ (merged to 'next' on 2024-01-19 at 498d203a57)
313
+ + t5541: remove lockfile creation
314
+ + t1401: remove lockfile creation
315
316
Tweak a few tests not to manually modify the reference database
317
(hence easier to work with other backends like reftable).
318
298
- Will merge to 'next'.
319
+ Will merge to 'master'.
320
source: <pull.1634.v2.git.1705004670.gitgitgadget@gmail.com>
321
322
323
* la/strvec-comment-fix (2024-01-12) 1 commit
303
- - strvec: use correct member name in comments
324
+ (merged to 'next' on 2024-01-19 at 120ef16493)
325
+ + strvec: use correct member name in comments
326
327
Comment fix.
328
307
- Will merge to 'next'.
329
+ Will merge to 'master'.
330
source: <pull.1640.git.1705043195997.gitgitgadget@gmail.com>
331
332
@@ -342,116 +364,79 @@ Release tarballs are available at:
364
365
366
* ne/doc-filter-blob-limit-fix (2024-01-16) 1 commit
345
- - rev-list-options: fix off-by-one in '--filter=blob:limit=<n>' explainer
367
+ (merged to 'next' on 2024-01-19 at 4f78975728)
368
+ + rev-list-options: fix off-by-one in '--filter=blob:limit=<n>' explainer
369
370
Docfix.
371
349
- Will merge to 'next'.
372
+ Will merge to 'master'.
373
source: <pull.1645.git.git.1705261850650.gitgitgadget@gmail.com>
374
375
376
* ps/commit-graph-write-leakfix (2024-01-15) 1 commit
354
- - commit-graph: fix memory leak when not writing graph
377
+ (merged to 'next' on 2024-01-19 at df537fac39)
378
+ + commit-graph: fix memory leak when not writing graph
379
380
Leakfix.
381
358
- Will merge to 'next'.
359
- source: <0feab5e7d5bc6275e2c7671cd8f6786ea86fd610.1702891190.git.ps@pks.im>
360
-
361
---------------------------------------------------
362
-[Cooking]
363
-
364
-* cp/t4129-pipefix (2024-01-10) 1 commit
365
- (merged to 'next' on 2024-01-12 at fd9b72b71a)
366
- + t4129: prevent loss of exit code due to the use of pipes
367
-
368
- Test update.
369
-
382
Will merge to 'master'.
371
- source: <pull.1636.git.1704891257544.gitgitgadget@gmail.com>
383
+ source: <0feab5e7d5bc6275e2c7671cd8f6786ea86fd610.1702891190.git.ps@pks.im>
384
385
386
* rj/advice-delete-branch-not-fully-merged (2024-01-11) 3 commits
375
- - branch: make the advice to force-deleting a conditional one
376
- - advice: fix an unexpected leading space
377
- - advice: sort the advice related lists
387
+ (merged to 'next' on 2024-01-19 at 7102eb6b79)
388
+ + branch: make the advice to force-deleting a conditional one
389
+ + advice: fix an unexpected leading space
390
+ + advice: sort the advice related lists
391
(this branch is used by rj/advice-disable-how-to-disable.)
392
393
The error message given when "git branch -d branch" fails due to
394
commits unique to the branch has been split into an error and a new
395
conditional advice message.
396
384
- Will merge to 'next'.
397
+ Will merge to 'master'.
398
source: <4aedc15c-4b3f-4f5e-abea-581b501600f8@gmail.com>
399
400
388
-* en/diffcore-delta-final-line-fix (2024-01-11) 1 commit
401
+* en/diffcore-delta-final-line-fix (2024-01-18) 1 commit
402
- diffcore-delta: avoid ignoring final 'line' of file
403
404
Rename detection logic ignored the final line of a file if it is an
405
incomplete line.
406
394
- Expecting a reroll.
395
- cf. <xmqqedenearc.fsf@gitster.g>
396
- source: <pull.1637.git.1705006074626.gitgitgadget@gmail.com>
407
+ Will merge to 'next'.
408
+ source: <pull.1637.v2.git.1705119973690.gitgitgadget@gmail.com>
409
410
411
* mj/gitweb-unreadable-config-error (2024-01-10) 1 commit
400
- - gitweb: die when a configuration file cannot be read
412
+ (merged to 'next' on 2024-01-19 at 790b7a7855)
413
+ + gitweb: die when a configuration file cannot be read
414
415
When given an existing but unreadable file as a configuration file,
416
gitweb behaved as if the file did not exist at all, but now it
417
errors out. This is a change that may break backward compatibility.
418
406
- Will merge to 'next'.
419
+ Will merge to 'master'.
420
source: <20240110225709.30168-1-marcelo.jimenez@gmail.com>
421
422
423
* ps/completion-with-reftable-fix (2024-01-16) 5 commits
411
- - completion: treat dangling symrefs as existing pseudorefs
412
- - completion: silence pseudoref existence check
413
- - completion: improve existence check for pseudo-refs
414
- - t9902: verify that completion does not print anything
415
- - completion: discover repo path in `__git_pseudoref_exists ()`
424
+ (merged to 'next' on 2024-01-19 at 8854a7d903)
425
+ + completion: treat dangling symrefs as existing pseudorefs
426
+ + completion: silence pseudoref existence check
427
+ + completion: improve existence check for pseudo-refs
428
+ + t9902: verify that completion does not print anything
429
+ + completion: discover repo path in `__git_pseudoref_exists ()`
430
431
Completion update to prepare for reftable
432
419
- Will merge to 'next'?
420
- source: <cover.1705314554.git.ps@pks.im>
421
-
422
-
423
-* ps/p4-use-ref-api (2024-01-11) 1 commit
424
- (merged to 'next' on 2024-01-12 at 3f89cf25f6)
425
- + git-p4: stop reaching into the refdb
426
-
427
- "git p4" update to prepare for reftable
428
-
429
- Will merge to 'master'.
430
- source: <33d6a062ec56be33ed50a42a420be0b023f6f4cf.1704980814.git.ps@pks.im>
431
-
432
-
433
-* ps/gitlab-ci-static-analysis (2024-01-08) 1 commit
434
- (merged to 'next' on 2024-01-10 at 71af34de07)
435
- + ci: add job performing static analysis on GitLab CI
436
-
437
- GitLab CI update.
438
-
439
- Will merge to 'master'.
440
- source: <1536a5ef07ad24dafb5d685b40099882f89e6cc5.1703761005.git.ps@pks.im>
441
-
442
-
443
-* ps/prompt-parse-HEAD-futureproof (2024-01-08) 2 commits
444
- (merged to 'next' on 2024-01-10 at f9515b9d89)
445
- + git-prompt: stop manually parsing HEAD with unknown ref formats
446
- + Merge branch 'ps/refstorage-extension' into ps/prompt-parse-HEAD-futureproof
447
-
448
- Futureproof command line prompt support (in contrib/).
449
-
433
Will merge to 'master'.
451
- source: <ef4e36a5a40c369da138242a8fdc9e12a846613b.1704356313.git.ps@pks.im>
434
+ source: <cover.1705314554.git.ps@pks.im>
435
436
454
-* ps/reftable-optimize-io (2024-01-11) 5 commits
437
+* ps/reftable-optimize-io (2024-01-18) 7 commits
438
+ - reftable/stack: fix race in up-to-date check
439
+ - reftable/stack: unconditionally reload stack after commit
440
(merged to 'next' on 2024-01-12 at 4096e880e0)
441
+ reftable/blocksource: use mmap to read tables
442
+ reftable/blocksource: refactor code to match our coding style
@@ -461,55 +446,36 @@ Release tarballs are available at:
446
447
Low-level I/O optimization for reftable.
448
464
- Will merge to 'master'.
449
+ The two commits at the tip are new.
450
+ Will merge to 'next' and then to 'master'?
451
source: <cover.1704966670.git.ps@pks.im>
452
+ source: <cover.1705585037.git.ps@pks.im>
453
454
468
-* rj/clarify-branch-doc-m (2024-01-08) 1 commit
469
- (merged to 'next' on 2024-01-10 at 432eaa2c6b)
470
- + branch: clarify <oldbranch> term
471
-
472
- Doc update.
473
-
474
- Will merge to 'master'.
475
- source: <d38e5a18-4d85-48f3-bc8b-8ca02ea683a4@gmail.com>
476
-
477
-
478
-* tb/fetch-all-configuration (2024-01-08) 1 commit
479
- (merged to 'next' on 2024-01-12 at 6a05050382)
480
- + fetch: add new config option fetch.all
481
-
482
- "git fetch" learned to pay attention to "fetch.all" configuration
483
- variable, which pretends as if "--all" was passed from the command
484
- line when no remote parameter was given.
485
-
486
- Will merge to 'master'.
487
- source: <20240108211832.47362-1-dev@tb6.eu>
488
-
489
-
490
-* rj/advice-disable-how-to-disable (2024-01-15) 1 commit
455
+* rj/advice-disable-how-to-disable (2024-01-16) 2 commits
456
- advice: allow disabling the automatic hint in advise_if_enabled()
457
+ - Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how-to-disable
458
(this branch uses rj/advice-delete-branch-not-fully-merged.)
459
460
All conditional "advice" messages show how to turn them off, which
461
becomes repetitive. Add a configuration variable to omit the
462
instruction.
463
498
- Will requeue with better dependencies before merging to 'next'.
499
- source: <c870a0b6-9fa8-4d00-a5a6-661ca175805f@gmail.com>
464
+ Will merge to 'next'?
465
+ source: <6a842ef8-b390-4739-9eef-e867d55ed5ea@gmail.com>
466
467
502
-* vd/fsck-submodule-url-test (2024-01-09) 3 commits
503
- - submodule-config.c: strengthen URL fsck check
504
- - t7450: test submodule urls
505
- - submodule-config.h: move check_submodule_url
468
+* vd/fsck-submodule-url-test (2024-01-19) 4 commits
469
+ (merged to 'next' on 2024-01-19 at dad35ae82c)
470
+ + submodule-config.c: strengthen URL fsck check
471
+ + t7450: test submodule urls
472
+ + test-submodule: remove command line handling for check-name
473
+ + submodule-config.h: move check_submodule_url
474
475
Tighten URL checks fsck makes in a URL recorded for submodules.
476
509
- Expecting a reroll (and review response).
510
- cf. <20240110103812.GB16674@coredump.intra.peff.net>
511
- cf. <ZZ46MrjSocJl-kpU@tanuki>
512
- source: <pull.1635.git.1704822817.gitgitgadget@gmail.com>
477
+ Will merge to 'master'.
478
+ source: <pull.1635.v2.git.1705542918.gitgitgadget@gmail.com>
479
480
481
* sd/negotiate-trace-fix (2024-01-03) 1 commit
@@ -522,32 +488,21 @@ Release tarballs are available at:
488
source: <20240103224054.1940209-1-delmerico@google.com>
489
490
525
-* sk/mingw-owner-check-error-message-improvement (2024-01-10) 1 commit
526
- (merged to 'next' on 2024-01-12 at 05c56e151b)
527
- + mingw: give more details about unsafe directory's ownership
528
-
529
- In addition to (rather cryptic) Security Identifiers, show username
530
- and domain in the error message when we barf on mismatch between
531
- the Git directory and the current user.
532
-
533
- Will merge to 'master'.
534
- source: <20240108173837.20480-2-soekkle@freenet.de>
535
-
536
-
491
* ps/worktree-refdb-initialization (2024-01-08) 7 commits
538
- - builtin/worktree: create refdb via ref backend
539
- - worktree: expose interface to look up worktree by name
540
- - builtin/worktree: move setup of commondir file earlier
541
- - refs/files: skip creation of "refs/{heads,tags}" for worktrees
542
- - setup: move creation of "refs/" into the files backend
543
- - refs: prepare `refs_init_db()` for initializing worktree refs
544
- - Merge branch 'ps/refstorage-extension' into ps/worktree-refdb-initialization
492
+ (merged to 'next' on 2024-01-19 at e8c649a3ac)
493
+ + builtin/worktree: create refdb via ref backend
494
+ + worktree: expose interface to look up worktree by name
495
+ + builtin/worktree: move setup of commondir file earlier
496
+ + refs/files: skip creation of "refs/{heads,tags}" for worktrees
497
+ + setup: move creation of "refs/" into the files backend
498
+ + refs: prepare `refs_init_db()` for initializing worktree refs
499
+ + Merge branch 'ps/refstorage-extension' into ps/worktree-refdb-initialization
500
501
Instead of manually creating refs/ hierarchy on disk upon a
502
creation of a secondary worktree, which is only usable via the
503
files backend, use the refs API to populate it.
504
550
- Will merge to 'next'.
505
+ Will merge to 'master'.
506
source: <cover.1704705733.git.ps@pks.im>
507
508
@@ -567,23 +522,13 @@ Release tarballs are available at:
522
523
524
* al/unit-test-ctype (2024-01-16) 1 commit
570
- - unit-tests: rewrite t/helper/test-ctype.c as a unit test
525
+ (merged to 'next' on 2024-01-19 at fcdad0d06c)
526
+ + unit-tests: rewrite t/helper/test-ctype.c as a unit test
527
528
Move test-ctype helper to the unit-test framework.
529
574
- Will merge to 'next'.
575
- source: <20240112102743.1440-1-ach.lumap@gmail.com>
576
-
577
-
578
-* bk/bisect-doc-fix (2024-01-10) 2 commits
579
- (merged to 'next' on 2024-01-12 at bdb3609554)
580
- + doc: refer to pathspec instead of path
581
- + doc: use singular form of repeatable path arg
582
-
583
- Synopsis fix.
584
-
530
Will merge to 'master'.
586
- source: <20240103040207.661413-1-britton.kerin@gmail.com>
531
+ source: <20240112102743.1440-1-ach.lumap@gmail.com>
532
533
534
* ja/doc-placeholders-fix (2023-12-26) 2 commits
@@ -621,7 +566,7 @@ Release tarballs are available at:
566
source: <cover.1699569246.git.me@ttaylorr.com>
567
568
624
-* tb/path-filter-fix (2023-10-18) 17 commits
569
+* tb/path-filter-fix (2024-01-16) 17 commits
570
- bloom: introduce `deinit_bloom_filters()`
571
- commit-graph: reuse existing Bloom filters where possible
572
- object.h: fix mis-aligned flag bits table
@@ -629,7 +574,7 @@ Release tarballs are available at:
574
- commit-graph.c: unconditionally load Bloom filters
575
- bloom: prepare to discard incompatible Bloom filters
576
- bloom: annotate filters with hash version
632
- - commit-graph: new filter ver. that fixes murmur3
577
+ - commit-graph: new Bloom filter version that fixes murmur3
578
- repo-settings: introduce commitgraph.changedPathsVersion
579
- t4216: test changed path filters with high bit paths
580
- t/helper/test-read-graph: implement `bloom-filters` mode
@@ -644,9 +589,8 @@ Release tarballs are available at:
589
on systems whose "char" is unsigned; update the implementation and
590
bump the format version to 2.
591
647
- Expecting a reroll?
648
- cf. <20231023202212.GA5470@szeder.dev>
649
- source: <cover.1697653929.git.me@ttaylorr.com>
592
+ Will merge to 'next'?
593
+ source: <cover.1705442923.git.me@ttaylorr.com>
594
595
596
* ak/color-decorate-symbols (2023-10-23) 7 commits