What's cooking (2024/01 #01)
Junio C Hamano committed
Jan 2, 2024 at 14:27 UTC
a86778aa51df3e7980abf1f6ae4989bdfb719d5d
1 file changed
+143
-304
whats-cooking.txt
+143
-304
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2023, #05; Wed, 27)
3
-X-master-at: e79552d19784ee7f4bbce278fe25f93fbda196fa
4
-X-next-at: 99fb0cbb532347ba88a24a050722cdec13dad2e8
2
+Subject: What's cooking in git.git (Jan 2024, #01; Tue, 2)
3
+X-master-at: a26002b62827b89a19b1084bd75d9371d565d03c
4
+X-next-at: 074686ec740dcf9adf7983090d00482a0390dc8a
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Dec 2023, #05; Wed, 27)
7
+What's cooking in git.git (Jan 2024, #01; Tue, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,14 +17,11 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
-The RelNotes symbolic link says we are now working towards Git 2.44.
21
-It may not be a bad idea to reflect on what technical debt and UI
22
-warts we have accumulated so far to see if we have enough of them to
23
-start planning for a breaking Git 3.0 release (or, of course, keep
24
-incrementally improve the system, which is much more preferrable---
25
-continuity and stability is good). End of year being a relatively
26
-quiet period, it may be a good time to think about your favorite pet
27
-peeve, to be discussed early next year.
20
+As the past couple of weeks have been slow, topics that have been
21
+merged to 'next' (and to a lessor extent, to 'master') this season
22
+may have seen less scrutinizing eyes than they deserve, which might
23
+lead bugs and regressions caused by them discovered later, but that
24
+is a regular part of life. Let's see what happens.
25
26
Copies of the source code to Git live in many repositories, and the
27
following is a list of the ones I push into or their mirrors. Some
@@ -57,189 +54,108 @@ Release tarballs are available at:
54
--------------------------------------------------
55
[Graduated to 'master']
56
60
-* es/add-doc-list-short-form-of-all-in-synopsis (2023-12-15) 1 commit
61
- (merged to 'next' on 2023-12-18 at a4f20da2bf)
62
- + git-add.txt: add missing short option -A to synopsis
63
-
64
- Doc update.
65
- source: <20231215204333.1253-1-ericsunshine@charter.net>
66
-
67
-
68
-* jc/checkout-B-branch-in-use (2023-12-13) 2 commits
69
- (merged to 'next' on 2023-12-14 at 0a3998619e)
70
- + checkout: forbid "-B <branch>" from touching a branch used elsewhere
71
- + checkout: refactor die_if_checked_out() caller
72
-
73
- "git checkout -B <branch> [<start-point>]" allowed a branch that is
74
- in use in another worktree to be updated and checked out, which
75
- might be a bit unexpected. The rule has been tightened, which is a
76
- breaking change. "--ignore-other-worktrees" option is required to
77
- unbreak you, if you are used to the current behaviour that "-B"
78
- overrides the safety.
79
- source: <xmqqjzq9cl70.fsf@gitster.g>
80
-
81
-
82
-* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
83
- (merged to 'next' on 2023-12-15 at 4aa7596593)
84
- + diff-lib: fix check_removed() when fsmonitor is active
85
- + Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
86
- + Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
87
- (this branch uses jc/fake-lstat.)
88
-
89
- The optimization based on fsmonitor in the "diff --cached"
90
- codepath is resurrected with the "fake-lstat" introduced earlier.
91
- cf. <e5295dbe-94d2-3186-5663-2466eba4bdde@jeffhostetler.com>
92
- source: <xmqqr0n0h0tw.fsf@gitster.g>
93
-
94
-
95
-* jc/doc-misspelt-refs-fix (2023-12-18) 1 commit
96
- (merged to 'next' on 2023-12-18 at e7799fd5c9)
97
- + doc: format.notes specify a ref under refs/notes/ hierarchy
98
-
99
- Doc update.
100
- source: <xmqqjzpfje33.fsf_-_@gitster.g>
101
-
102
-
103
-* jc/doc-most-refs-are-not-that-special (2023-12-15) 5 commits
104
- (merged to 'next' on 2023-12-18 at aead30fcc8)
105
- + docs: MERGE_AUTOSTASH is not that special
106
- + docs: AUTO_MERGE is not that special
107
- + refs.h: HEAD is not that special
108
- + git-bisect.txt: BISECT_HEAD is not that special
109
- + git.txt: HEAD is not that special
110
-
111
- Doc updates.
112
- source: <20231215203245.3622299-1-gitster@pobox.com>
113
-
114
-
115
-* jc/fake-lstat (2023-09-15) 1 commit
116
- (merged to 'next' on 2023-12-15 at 48e34cc0b4)
117
- + cache: add fake_lstat()
118
- (this branch is used by jc/diff-cached-fsmonitor-fix.)
119
-
120
- A new helper to let us pretend that we called lstat() when we know
121
- our cache_entry is up-to-date via fsmonitor.
122
- cf. <e5295dbe-94d2-3186-5663-2466eba4bdde@jeffhostetler.com>
123
- source: <xmqqcyykig1l.fsf@gitster.g>
124
-
125
-
126
-* jk/mailinfo-iterative-unquote-comment (2023-12-14) 2 commits
127
- (merged to 'next' on 2023-12-18 at 92363605fd)
128
- + mailinfo: avoid recursion when unquoting From headers
129
- + t5100: make rfc822 comment test more careful
130
- (this branch uses jk/mailinfo-oob-read-fix.)
131
-
132
- The code to parse the From e-mail header has been updated to avoid
133
- recursion.
134
- source: <20231214214444.GB2297853@coredump.intra.peff.net>
135
-
57
+* jc/orphan-unborn (2023-11-24) 2 commits
58
+ (merged to 'next' on 2023-12-21 at 030300487a)
59
+ + orphan/unborn: fix use of 'orphan' in end-user facing messages
60
+ + orphan/unborn: add to the glossary and use them consistently
61
137
-* jk/mailinfo-oob-read-fix (2023-12-12) 1 commit
138
- (merged to 'next' on 2023-12-14 at 0dcfcb0d02)
139
- + mailinfo: fix out-of-bounds memory reads in unquote_quoted_pair()
140
- (this branch is used by jk/mailinfo-iterative-unquote-comment.)
62
+ Doc updates to clarify what an "unborn branch" means.
63
+ source: <xmqq4jhb977x.fsf@gitster.g>
64
142
- OOB read fix.
143
- source: <20231212221243.GA1656116@coredump.intra.peff.net>
65
66
+* jc/retire-cas-opt-name-constant (2023-12-19) 1 commit
67
+ (merged to 'next' on 2023-12-21 at 39ef057c8b)
68
+ + remote.h: retire CAS_OPT_NAME
69
146
-* jx/fetch-atomic-error-message-fix (2023-12-18) 2 commits
147
- (merged to 'next' on 2023-12-18 at a1988b00e5)
148
- + fetch: no redundant error message for atomic fetch
149
- + t5574: test porcelain output of atomic fetch
70
+ Code clean-up.
71
+ source: <xmqq5y0uc7tq.fsf@gitster.g>
72
151
- "git fetch --atomic" issued an unnecessary empty error message,
152
- which has been corrected.
153
- cf. <ZX__e7VjyLXIl-uV@tanuki>
154
- source: <cover.1702821462.git.zhiyou.jx@alibaba-inc.com>
73
74
+* la/trailer-cleanups (2023-12-20) 3 commits
75
+ (merged to 'next' on 2023-12-21 at e26ede5f55)
76
+ + trailer: use offsets for trailer_start/trailer_end
77
+ + trailer: find the end of the log message
78
+ + commit: ignore_non_trailer computes number of bytes to ignore
79
157
-* ps/chainlint-self-check-update (2023-12-15) 1 commit
158
- (merged to 'next' on 2023-12-18 at 0de2e1807f)
159
- + tests: adjust whitespace in chainlint expectations
80
+ Code clean-up.
81
+ source: <pull.1563.v5.git.1697828495.gitgitgadget@gmail.com>
82
161
- Test framework update.
162
- source: <fb312f559de7b99244e4c86a995250599cd9be06.1702622508.git.ps@pks.im>
83
84
+* ps/pseudo-refs (2023-12-14) 4 commits
85
+ (merged to 'next' on 2023-12-21 at 3460e3d667)
86
+ + bisect: consistently write BISECT_EXPECTED_REV via the refdb
87
+ + refs: complete list of special refs
88
+ + refs: propagate errno when reading special refs fails
89
+ + wt-status: read HEAD and ORIG_HEAD via the refdb
90
165
-* ps/clone-into-reftable-repository (2023-12-12) 7 commits
166
- (merged to 'next' on 2023-12-19 at adf7eb1f84)
167
- + builtin/clone: create the refdb with the correct object format
168
- + builtin/clone: skip reading HEAD when retrieving remote
169
- + builtin/clone: set up sparse checkout later
170
- + builtin/clone: fix bundle URIs with mismatching object formats
171
- + remote-curl: rediscover repository when fetching refs
172
- + setup: allow skipping creation of the refdb
173
- + setup: extract function to create the refdb
174
- (this branch is used by ps/refstorage-extension.)
91
+ Assorted changes around pseudoref handling.
92
+ source: <cover.1702560829.git.ps@pks.im>
93
176
- "git clone" has been prepared to allow cloning a repository with
177
- non-default hash function into a repository that uses the reftable
178
- backend.
179
- source: <cover.1702361370.git.ps@pks.im>
94
95
+* rj/status-bisect-while-rebase (2023-10-16) 1 commit
96
+ (merged to 'next' on 2023-12-21 at 929a027fb7)
97
+ + status: fix branch shown when not only bisecting
98
182
-* ps/reftable-fixes (2023-12-11) 11 commits
183
- (merged to 'next' on 2023-12-15 at ebba966016)
184
- + reftable/block: reuse buffer to compute record keys
185
- + reftable/block: introduce macro to initialize `struct block_iter`
186
- + reftable/merged: reuse buffer to compute record keys
187
- + reftable/stack: fix use of unseeded randomness
188
- + reftable/stack: fix stale lock when dying
189
- + reftable/stack: reuse buffers when reloading stack
190
- + reftable/stack: perform auto-compaction with transactional interface
191
- + reftable/stack: verify that `reftable_stack_add()` uses auto-compaction
192
- + reftable: handle interrupted writes
193
- + reftable: handle interrupted reads
194
- + reftable: wrap EXPECT macros in do/while
195
- (this branch is used by ps/reftable-fixes-and-optims.)
99
+ "git status" is taught to show both the branch being bisected and
100
+ being rebased when both are in effect at the same time.
101
+ cf. <xmqqil76kyov.fsf@gitster.g>
102
+ source: <2e24ca9b-9c5f-f4df-b9f8-6574a714dfb2@gmail.com>
103
197
- Bunch of small fix-ups to the reftable code.
198
- source: <cover.1702285387.git.ps@pks.im>
104
105
+* rs/rebase-use-strvec-pushf (2023-12-20) 1 commit
106
+ (merged to 'next' on 2023-12-20 at ecb190973c)
107
+ + rebase: use strvec_pushf() for format-patch revisions
108
201
-* rs/c99-stdbool-test-balloon (2023-12-18) 1 commit
202
- (merged to 'next' on 2023-12-18 at 5a62aaa127)
203
- + git-compat-util: convert skip_{prefix,suffix}{,_mem} to bool
109
+ Code clean-up.
110
+ source: <4ab7431c-6c1b-448c-b4d2-e8b9be0e4eef@web.de>
111
205
- Test balloon to use C99 "bool" type from <stdbool.h>.
206
- source: <2d30dc36-6091-4b47-846f-92d3f4a8b135@web.de>
112
113
+* sh/completion-with-reftable (2023-12-19) 2 commits
114
+ (merged to 'next' on 2023-12-20 at 7957d4aa5b)
115
+ + completion: support pseudoref existence checks for reftables
116
+ + completion: refactor existence checks for pseudorefs
117
209
-* rs/show-ref-incompatible-options (2023-12-11) 1 commit
210
- (merged to 'next' on 2023-12-18 at 5a092285f7)
211
- + show-ref: use die_for_incompatible_opt3()
118
+ Command line completion script (in contrib/) learned to work better
119
+ with the reftable backend.
120
+ source: <cover.1703022850.git.stanhu@gmail.com>
121
213
- Code clean-up for sanity checking of command line options for "git
214
- show-ref".
215
- source: <e5304253-3347-4900-bbf2-d3c6ee3fb976@web.de>
122
+--------------------------------------------------
123
+[New Topics]
124
125
+* cp/sideband-array-index-comment-fix (2023-12-28) 1 commit
126
+ - sideband.c: remove redundant 'NEEDSWORK' tag
127
218
-* rs/t6300-compressed-size-fix (2023-12-12) 1 commit
219
- (merged to 'next' on 2023-12-19 at 37ed09549c)
220
- + t6300: avoid hard-coding object sizes
128
+ In-code comment fix.
129
+ source: <pull.1625.v4.git.1703750460527.gitgitgadget@gmail.com>
130
222
- Test fix.
223
- source: <9feeb6cf-aabf-4002-917f-3f6c27547bc8@web.de>
131
132
+* ps/worktree-refdb-initialization (2023-12-28) 6 commits
133
+ - builtin/worktree: create refdb via ref backend
134
+ - worktree: expose interface to look up worktree by name
135
+ - builtin/worktree: move setup of commondir file earlier
136
+ - refs/files: skip creation of "refs/{heads,tags}" for worktrees
137
+ - setup: move creation of "refs/" into the files backend
138
+ - refs: prepare `refs_init_db()` for initializing worktree refs
139
226
-* sp/test-i18ngrep (2023-12-18) 1 commit
227
- (merged to 'next' on 2023-12-18 at d54442693a)
228
- + test-lib-functions.sh: fix test_grep fail message wording
140
+ Instead of manually creating refs/ hierarchy on disk upon a
141
+ creation of a secondary worktree, which is only usable via the
142
+ files backend, use the refs API to populate it.
143
230
- Error message fix in the test framework.
231
- source: <20231203171956.771-1-shreyanshpaliwalcmsmn@gmail.com>
144
+ May want to wait until other topics solidify a bit more.
145
+ cf. <xmqqedf6gpt8.fsf@gitster.g>
146
+ source: <cover.1703754513.git.ps@pks.im>
147
148
--------------------------------------------------
234
-[New Topics]
149
+[Cooking]
150
151
* ml/doc-merge-updates (2023-12-20) 2 commits
237
- - Documentation/git-merge.txt: use backticks for command wrapping
238
- - Documentation/git-merge.txt: fix reference to synopsis
152
+ (merged to 'next' on 2023-12-28 at 7a6329a219)
153
+ + Documentation/git-merge.txt: use backticks for command wrapping
154
+ + Documentation/git-merge.txt: fix reference to synopsis
155
156
Doc update.
157
242
- Will merge to 'next'.
158
+ Will merge to 'master'.
159
source: <20231220195342.17590-1-mi.al.lohmann@gmail.com>
160
161
@@ -259,48 +175,49 @@ Release tarballs are available at:
175
176
177
* jc/archive-list-with-extra-args (2023-12-21) 1 commit
262
- - archive: "--list" does not take further options
178
+ (merged to 'next' on 2023-12-28 at 2d5c20e67f)
179
+ + archive: "--list" does not take further options
180
181
"git archive --list extra garbage" silently ignored excess command
182
line parameters, which has been corrected.
183
267
- Will merge to 'next'.
184
+ Will merge to 'master'.
185
source: <xmqqmsu3mnix.fsf@gitster.g>
186
187
188
* jk/t1006-cat-file-objectsize-disk (2023-12-21) 1 commit
272
- - t1006: add tests for %(objectsize:disk)
189
+ (merged to 'next' on 2023-12-28 at d82812e636)
190
+ + t1006: add tests for %(objectsize:disk)
191
192
Test update.
193
276
- Will merge to 'next'.
194
+ Will merge to 'master'.
195
source: <20231221094722.GA570888@coredump.intra.peff.net>
196
197
280
-* js/contributor-docs-updates (2023-12-21) 9 commits
281
- - SubmittingPatches: hyphenate non-ASCII
282
- - SubmittingPatches: clarify GitHub artifact format
283
- - SubmittingPatches: clarify GitHub visual
284
- - SubmittingPatches: improve extra tags advice
285
- - SubmittingPatches: update extra tags list
286
- - SubmittingPatches: discourage new trailers
287
- - SubmittingPatches: drop ref to "What's in git.git"
288
- - CodingGuidelines: write punctuation marks
289
- - CodingGuidelines: move period inside parentheses
198
+* js/contributor-docs-updates (2023-12-27) 9 commits
199
+ (merged to 'next' on 2024-01-02 at 0e072117cd)
200
+ + SubmittingPatches: hyphenate non-ASCII
201
+ + SubmittingPatches: clarify GitHub artifact format
202
+ + SubmittingPatches: clarify GitHub visual
203
+ + SubmittingPatches: provide tag naming advice
204
+ + SubmittingPatches: update extra tags list
205
+ + SubmittingPatches: discourage new trailers
206
+ + SubmittingPatches: drop ref to "What's in git.git"
207
+ + CodingGuidelines: write punctuation marks
208
+ + CodingGuidelines: move period inside parentheses
209
210
Doc update.
211
293
- Expecting a reroll, but basically looking good.
294
- source: <pull.1623.v2.git.1703176865.gitgitgadget@gmail.com>
212
+ Will merge to 'master'.
213
+ source: <pull.1623.v3.git.1703739324.gitgitgadget@gmail.com>
214
215
297
-* al/unit-test-ctype (2023-12-26) 1 commit
298
- - unit-tests: rewrite t/helper/test-ctype.c as a unit test.
216
+* al/unit-test-ctype (2024-01-02) 1 commit
217
+ - unit-tests: rewrite t/helper/test-ctype.c as a unit test
218
219
Move test-ctype helper to the unit-test framework.
301
-
302
- Expecting a reroll.
303
- source: <20231221231527.8130-1-ach.lumap@gmail.com>
220
+ source: <20240101104017.9452-2-ach.lumap@gmail.com>
221
222
223
* bk/bisect-doc-fix (2023-12-27) 1 commit
@@ -313,13 +230,14 @@ Release tarballs are available at:
230
231
232
* en/sparse-checkout-eoo (2023-12-26) 2 commits
316
- - sparse-checkout: be consistent with end of options markers
317
- - Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options
233
+ (merged to 'next' on 2023-12-28 at 3ddf2ebab6)
234
+ + sparse-checkout: be consistent with end of options markers
235
+ + Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options
236
237
"git sparse-checkout (add|set) --[no-]cone --end-of-options" did
238
not handle "--end-of-options" correctly after a recent update.
239
322
- Will merge to 'next'.
240
+ Will merge to 'master'.
241
source: <pull.1625.v2.git.git.1703619562639.gitgitgadget@gmail.com>
242
243
@@ -334,58 +252,39 @@ Release tarballs are available at:
252
253
254
* jc/sparse-checkout-set-default-fix (2023-12-26) 1 commit
337
- - sparse-checkout: use default patterns for 'set' only !stdin
255
+ (merged to 'next' on 2023-12-28 at a558eccf8e)
256
+ + sparse-checkout: use default patterns for 'set' only !stdin
257
258
"git sparse-checkout set" added default patterns even when the
259
patterns are being fed from the standard input, which has been
260
corrected.
261
343
- Will merge to 'next'.
262
+ Will merge to 'master'.
263
source: <20231221065925.3234048-3-gitster@pobox.com>
264
265
266
* rs/fast-import-simplify-mempool-allocation (2023-12-26) 1 commit
348
- - fast-import: use mem_pool_calloc()
267
+ (merged to 'next' on 2023-12-28 at 16e6dd2a69)
268
+ + fast-import: use mem_pool_calloc()
269
270
Code simplification.
271
352
- Will merge to 'next'.
272
+ Will merge to 'master'.
273
source: <50c1f410-ca37-4c1c-a28b-3e9fad49f2b4@web.de>
274
275
356
-* rs/mem-pool-improvements (2023-12-26) 2 commits
357
- - mem-pool: simplify alignment calculation
358
- - mem-pool: fix big allocations
276
+* rs/mem-pool-improvements (2023-12-28) 2 commits
277
+ (merged to 'next' on 2023-12-28 at aa03d9441c)
278
+ + mem-pool: simplify alignment calculation
279
+ + mem-pool: fix big allocations
280
281
MemPool allocator fixes.
282
362
- Will merge to 'next'.
363
- source: <3e15d11a-bd19-49ca-b674-9b50e0ba7fc2@web.de>
364
-
365
---------------------------------------------------
366
-[Cooking]
367
-
368
-* jc/retire-cas-opt-name-constant (2023-12-19) 1 commit
369
- (merged to 'next' on 2023-12-21 at 39ef057c8b)
370
- + remote.h: retire CAS_OPT_NAME
371
-
372
- Code clean-up.
373
-
283
Will merge to 'master'.
375
- source: <xmqq5y0uc7tq.fsf@gitster.g>
376
-
284
+ source: <fa89d269-1a23-4ed6-bebc-30c0b629f444@web.de>
285
378
-* rs/rebase-use-strvec-pushf (2023-12-20) 1 commit
379
- (merged to 'next' on 2023-12-20 at ecb190973c)
380
- + rebase: use strvec_pushf() for format-patch revisions
286
382
- Code clean-up.
383
-
384
- Will merge to 'master'.
385
- source: <4ab7431c-6c1b-448c-b4d2-e8b9be0e4eef@web.de>
386
-
387
-
388
-* ps/refstorage-extension (2023-12-20) 13 commits
287
+* ps/refstorage-extension (2024-01-02) 13 commits
288
- t9500: write "extensions.refstorage" into config
289
- builtin/clone: introduce `--ref-format=` value flag
290
- builtin/init: introduce `--ref-format=` value flag
@@ -394,7 +293,7 @@ Release tarballs are available at:
293
- setup: introduce GIT_DEFAULT_REF_FORMAT envvar
294
- setup: introduce "extensions.refStorage" extension
295
- setup: set repository's formats on init
397
- - setup: start tracking ref storage format when
296
+ - setup: start tracking ref storage format
297
- refs: refactor logic to look up storage backends
298
- worktree: skip reading HEAD when repairing worktrees
299
- t: introduce DEFAULT_REPO_FORMAT prereq
@@ -403,38 +302,26 @@ Release tarballs are available at:
302
Introduce a new extension "refstorage" so that we can mark a
303
repository that uses a non-default ref backend, like reftable.
304
406
- Needs review.
407
- source: <cover.1703067989.git.ps@pks.im>
305
+ Will merge to 'next'?
306
+ source: <cover.1703833818.git.ps@pks.im>
307
308
410
-* ps/reftable-fixes-and-optims (2023-12-20) 9 commits
411
- - SQUASH??? make "make hdr-check" pass
309
+* ps/reftable-fixes-and-optims (2023-12-28) 9 commits
310
- reftable/merged: transfer ownership of records when iterating
311
- reftable/merged: really reuse buffers to compute record keys
312
- reftable/record: store "val2" hashes as static arrays
313
- reftable/record: store "val1" hashes as static arrays
314
- reftable/record: constify some parts of the interface
315
- reftable/writer: fix index corruption when writing multiple indices
316
+ - reftable/stack: do not auto-compact twice in `reftable_stack_add()`
317
- reftable/stack: do not overwrite errors when compacting
318
- Merge branch 'ps/reftable-fixes' into ps/reftable-fixes-and-optims
319
320
More fixes and optimizations to the reftable backend.
321
423
- Needs review.
424
- source: <cover.1703063544.git.ps@pks.im>
425
-
426
-
427
-* ps/pseudo-refs (2023-12-14) 4 commits
428
- (merged to 'next' on 2023-12-21 at 3460e3d667)
429
- + bisect: consistently write BISECT_EXPECTED_REV via the refdb
430
- + refs: complete list of special refs
431
- + refs: propagate errno when reading special refs fails
432
- + wt-status: read HEAD and ORIG_HEAD via the refdb
433
-
434
- Assorted changes around pseudoref handling.
435
-
436
- Will merge to 'master'.
437
- source: <cover.1702560829.git.ps@pks.im>
322
+ Expecting a (hopefully minor and final) reroll.
323
+ cf. <xmqqtto2gswa.fsf@gitster.g>
324
+ source: <cover.1703743174.git.ps@pks.im>
325
326
327
* tb/multi-pack-verbatim-reuse (2023-12-14) 26 commits
@@ -483,59 +370,37 @@ Release tarballs are available at:
370
source: <xmqqzfyjmk02.fsf@gitster.g>
371
372
486
-* sh/completion-with-reftable (2023-12-19) 2 commits
487
- (merged to 'next' on 2023-12-20 at 7957d4aa5b)
488
- + completion: support pseudoref existence checks for reftables
489
- + completion: refactor existence checks for pseudorefs
490
-
491
- Command line completion script (in contrib/) learned to work better
492
- with the reftable backend.
493
-
494
- Will merge to 'master'.
495
- source: <cover.1703022850.git.stanhu@gmail.com>
496
-
497
-
373
* en/header-cleanup (2023-12-26) 12 commits
499
- - treewide: remove unnecessary includes in source files
500
- - treewide: add direct includes currently only pulled in transitively
501
- - trace2/tr2_tls.h: remove unnecessary include
502
- - submodule-config.h: remove unnecessary include
503
- - pkt-line.h: remove unnecessary include
504
- - line-log.h: remove unnecessary include
505
- - http.h: remove unnecessary include
506
- - fsmonitor--daemon.h: remove unnecessary includes
507
- - blame.h: remove unnecessary includes
508
- - archive.h: remove unnecessary include
509
- - treewide: remove unnecessary includes in source files
510
- - treewide: remove unnecessary includes from header files
374
+ (merged to 'next' on 2023-12-28 at 1ccddc2a10)
375
+ + treewide: remove unnecessary includes in source files
376
+ + treewide: add direct includes currently only pulled in transitively
377
+ + trace2/tr2_tls.h: remove unnecessary include
378
+ + submodule-config.h: remove unnecessary include
379
+ + pkt-line.h: remove unnecessary include
380
+ + line-log.h: remove unnecessary include
381
+ + http.h: remove unnecessary include
382
+ + fsmonitor--daemon.h: remove unnecessary includes
383
+ + blame.h: remove unnecessary includes
384
+ + archive.h: remove unnecessary include
385
+ + treewide: remove unnecessary includes in source files
386
+ + treewide: remove unnecessary includes from header files
387
388
Remove unused header "#include".
389
514
- Will merge to 'next'.
515
- source: <pull.1617.v2.git.1703351700.gitgitgadget@gmail.com>
516
-
517
-
518
-* jc/orphan-unborn (2023-11-24) 2 commits
519
- (merged to 'next' on 2023-12-21 at 030300487a)
520
- + orphan/unborn: fix use of 'orphan' in end-user facing messages
521
- + orphan/unborn: add to the glossary and use them consistently
522
-
523
- Doc updates to clarify what an "unborn branch" means.
524
-
390
Will merge to 'master'.
526
- source: <xmqq4jhb977x.fsf@gitster.g>
391
+ source: <pull.1617.v2.git.1703351700.gitgitgadget@gmail.com>
392
393
529
-* jw/builtin-objectmode-attr (2023-12-12) 2 commits
530
- - SQUASH??? - leakfix
531
- - attr: add builtin objectmode values support
394
+* jw/builtin-objectmode-attr (2023-12-28) 1 commit
395
+ (merged to 'next' on 2024-01-02 at 4c3784b3a1)
396
+ + attr: add builtin objectmode values support
397
398
The builtin_objectmode attribute is populated for each path
399
without adding anything in .gitattributes files, which would be
400
useful in magic pathspec, e.g., ":(attr:builtin_objectmode=100755)"
401
to limit to executables.
402
538
- Needs to get leakfix reviewed.
403
+ Will merge to 'master'.
404
cf. <xmqq5y0ssknj.fsf@gitster.g>
405
source: <20231116054437.2343549-1-jojwang@google.com>
406
@@ -614,18 +479,6 @@ Release tarballs are available at:
479
source: <20231023221143.72489-1-andy.koppe@gmail.com>
480
481
617
-* la/trailer-cleanups (2023-12-20) 3 commits
618
- (merged to 'next' on 2023-12-21 at e26ede5f55)
619
- + trailer: use offsets for trailer_start/trailer_end
620
- + trailer: find the end of the log message
621
- + commit: ignore_non_trailer computes number of bytes to ignore
622
-
623
- Code clean-up.
624
-
625
- Will merge to 'master'.
626
- source: <pull.1563.v5.git.1697828495.gitgitgadget@gmail.com>
627
-
628
-
482
* eb/hash-transition (2023-10-02) 30 commits
483
- t1016-compatObjectFormat: add tests to verify the conversion between objects
484
- t1006: test oid compatibility with cat-file
@@ -699,19 +552,6 @@ Release tarballs are available at:
552
Not ready to be reviewed yet.
553
source: <20230824205456.1231371-1-gitster@pobox.com>
554
702
-
703
-* rj/status-bisect-while-rebase (2023-10-16) 1 commit
704
- (merged to 'next' on 2023-12-21 at 929a027fb7)
705
- + status: fix branch shown when not only bisecting
706
-
707
- "git status" is taught to show both the branch being bisected and
708
- being rebased when both are in effect at the same time.
709
-
710
- Will merge to 'master'.
711
- cf. <xmqqil76kyov.fsf@gitster.g>
712
- source: <2e24ca9b-9c5f-f4df-b9f8-6574a714dfb2@gmail.com>
713
-
714
-
555
--------------------------------------------------
556
[Discarded]
557
@@ -720,11 +560,10 @@ Release tarballs are available at:
560
. sparse-checkout: use default patterns for 'set' only !stdin
561
. SQUASH??? end-of-options test
562
. sparse-checkout: take care of "--end-of-options" in set/add/check-rules
723
- - Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options
563
+ + Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options
564
565
"git sparse-checkout (add|set) --[no-]cone --end-of-options" did
566
not handle "--end-of-options" correctly after a recent update.
567
568
Superseded by the en/sparse-checkout-eoo topic.
569
source: <20231221065925.3234048-1-gitster@pobox.com>
730
-