What's cooking (2024/02 #04)
Junio C Hamano committed
Feb 8, 2024 at 22:26 UTC
07ffb4fd1f889b3d1c035f6b825acb1f44112351
1 file changed
+234
-272
whats-cooking.txt
+234
-272
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2024, #03; Tue, 6)
3
-X-master-at: 235986be822c9f8689be2e9a0b7804d0b1b6d821
4
-X-next-at: 7a6a6b9afef46aae13590758ab4d6e6832820410
2
+Subject: What's cooking in git.git (Feb 2024, #04; Thu, 8)
3
+X-master-at: 5216f8f5c4089ec29ce49afa147434c23e0f0163
4
+X-next-at: 5546620c9085abb7ffcf1203c4e150d0cc96ba91
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Feb 2024, #03; Tue, 6)
7
+What's cooking in git.git (Feb 2024, #04; Thu, 8)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +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 preview release Git 2.44-rc0 has been tagged. Let's see how
21
+well this pre-release period goes; unlike previous cycles, I planned
22
+only for one release candidate in the middle of next week until the
23
+final release around the 20th.
24
+
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
27
repositories have only a subset of branches.
@@ -48,134 +53,132 @@ Release tarballs are available at:
53
--------------------------------------------------
54
[Graduated to 'master']
55
51
-* cb/use-freebsd-13-2-at-cirrus-ci (2024-01-31) 1 commit
52
- (merged to 'next' on 2024-01-31 at f89dc8a289)
53
- + ci: update FreeBSD cirrus job
56
+* cp/unit-test-prio-queue (2024-01-22) 1 commit
57
+ (merged to 'next' on 2024-02-01 at 38aa6559b0)
58
+ + tests: move t0009-prio-queue.sh to the new unit testing framework
59
55
- Cirrus CI jobs started breaking because we specified version of
56
- FreeBSD that is no longer available, which has been corrected.
57
- source: <20240131191325.33228-1-carenas@gmail.com>
60
+ The priority queue test has been migrated to the unit testing
61
+ framework.
62
+ source: <pull.1642.v4.git.1705865326185.gitgitgadget@gmail.com>
63
64
60
-* jc/comment-style-fixes (2024-01-29) 3 commits
61
- (merged to 'next' on 2024-01-30 at a58d48a9ce)
62
- + reftable/pq_test: comment style fix
63
- + merge-ort.c: comment style fix
64
- + builtin/worktree: comment style fixes
65
+* ja/doc-placeholders-fix (2023-12-26) 2 commits
66
+ (merged to 'next' on 2024-02-05 at 047da8cbb0)
67
+ + doc: enforce placeholders in documentation
68
+ + doc: enforce dashes in placeholders
69
+
70
+ Docfix.
71
+ source: <pull.1626.git.1703539287.gitgitgadget@gmail.com>
72
66
- Rewrite //-comments to /* comments */ in files whose comments
67
- prevalently use the latter.
68
- source: <20240129202839.2234084-1-gitster@pobox.com>
73
74
+* jc/index-pack-fsck-levels (2024-02-01) 2 commits
75
+ (merged to 'next' on 2024-02-02 at 0e4ef26aa1)
76
+ + index-pack: --fsck-objects to take an optional argument for fsck msgs
77
+ + index-pack: test and document --strict=<msg-id>=<severity>...
78
71
-* jc/make-libpath-template (2024-01-31) 2 commits
72
- (merged to 'next' on 2024-01-31 at 559d5138bc)
73
- + Makefile: simplify output of the libpath_template
74
- + Makefile: reduce repetitive library paths
79
+ The "--fsck-objects" option of "git index-pack" now can take the
80
+ optional parameter to tweak severity of different fsck errors.
81
+ source: <pull.1658.v4.git.git.1706751483.gitgitgadget@gmail.com>
82
76
- The Makefile often had to say "-L$(path) -R$(path)" that repeats
77
- the path to the same library directory for link time and runtime.
78
- A Makefile template is used to reduce such repetition.
79
- source: <20240131174220.4160560-1-gitster@pobox.com>
83
84
+* jh/sparse-index-expand-to-path-fix (2024-02-02) 1 commit
85
+ (merged to 'next' on 2024-02-06 at 17ec59dd9a)
86
+ + sparse-index: pass string length to index_file_exists()
87
82
-* jc/reftable-core-fsync (2024-01-30) 2 commits
83
- (merged to 'next' on 2024-01-30 at c3a79b6172)
84
- + reftable/stack: fsync "tables.list" during compaction
85
- (merged to 'next' on 2024-01-24 at cea12beddb)
86
- + reftable: honor core.fsync
87
- (this branch is used by ps/reftable-multi-level-indices-fix.)
88
+ A caller called index_file_exists() that takes a string expressed
89
+ as <ptr, length> with a wrong length, which has been corrected.
90
+ source: <pull.1649.git.1706897095273.gitgitgadget@gmail.com>
91
89
- The write codepath for the reftable data learned to honor
90
- core.fsync configuration.
91
- source: <7bdafc9bd7f53f38a24d69a563615b6ad484e1ba.1706592127.git.ps@pks.im>
92
93
+* jk/unit-tests-buildfix (2024-02-02) 4 commits
94
+ (merged to 'next' on 2024-02-02 at 8838dd21e8)
95
+ + t/Makefile: say the default target upfront
96
+ (merged to 'next' on 2024-01-31 at 00df31c4c8)
97
+ + t/Makefile: get UNIT_TESTS list from C sources
98
+ + Makefile: remove UNIT_TEST_BIN directory with "make clean"
99
+ + Makefile: use mkdir_p_parent_template for UNIT_TEST_BIN
100
+ (this branch is used by js/unit-test-suite-runner.)
101
94
-* jc/t0091-with-unknown-git (2024-01-30) 1 commit
95
- (merged to 'next' on 2024-01-31 at 3dfcad1b18)
96
- + t0091: allow test in a repository without tags
102
+ Build dependency around unit tests has been fixed.
103
+ source: <20240130053714.GA165967@coredump.intra.peff.net>
104
+ source: <xmqqjznmtjr9.fsf@gitster.g>
105
98
- The test did not work when Git was built from a repository without
99
- tags.
100
- source: <xmqqv87aabk3.fsf@gitster.g>
106
107
+* mh/credential-oauth-refresh-token-with-wincred (2024-01-29) 1 commit
108
+ (merged to 'next' on 2024-02-05 at 68880a751a)
109
+ + credential/wincred: store oauth_refresh_token
110
103
-* jk/diff-external-with-no-index (2024-01-29) 1 commit
104
- (merged to 'next' on 2024-01-30 at 30c3e9f91d)
105
- + diff: handle NULL meta-info when spawning external diff
111
+ The wincred credential backend has been taught to support oauth refresh
112
+ token the same way as credential-cache and credential-libsecret backends.
113
+ source: <pull.1534.v3.git.1706477103039.gitgitgadget@gmail.com>
114
107
- "git diff --no-index file1 file2" segfaulted while invoking the
108
- external diff driver, which has been corrected.
109
- source: <20240129015708.GA1762343@coredump.intra.peff.net>
115
116
+* pb/imap-send-wo-curl-build-fix (2024-02-01) 1 commit
117
+ (merged to 'next' on 2024-02-05 at 18368f61a7)
118
+ + imap-send: add missing "strbuf.h" include under NO_CURL
119
112
-* js/win32-retry-pipe-write-on-enospc (2024-01-30) 1 commit
113
- (merged to 'next' on 2024-01-31 at 60ad589fd0)
114
- + win32: special-case `ENOSPC` when writing to a pipe
120
+ Build fix.
121
+ source: <pull.1664.git.git.1706833113569.gitgitgadget@gmail.com>
122
116
- Update to the code that writes to pipes on Windows.
117
- source: <pull.1648.git.1706650619950.gitgitgadget@gmail.com>
123
+--------------------------------------------------
124
+[New Topics]
125
126
+* pw/show-ref-pseudorefs (2024-02-07) 2 commits
127
+ (merged to 'next' on 2024-02-08 at 7e9f850dba)
128
+ + t1400: use show-ref to check pseudorefs
129
+ + show-ref --verify: accept pseudorefs
130
120
-* jt/p4-spell-re-with-raw-string (2024-01-29) 1 commit
121
- (merged to 'next' on 2024-01-30 at 42b03b58eb)
122
- + git-p4: use raw string literals for regular expressions
131
+ "git show-ref --verify" did not show things like "CHERRY_PICK_HEAD",
132
+ which has been corrected.
133
124
- "git p4" update to squelch warnings from Python.
125
- source: <pull.1639.v2.git.1706312496608.gitgitgadget@gmail.com>
134
+ Will merge to 'master'.
135
+ source: <pull.1654.git.1707324277.gitgitgadget@gmail.com>
136
137
128
-* kh/maintenance-use-xdg-when-it-should (2024-01-29) 1 commit
129
- (merged to 'next' on 2024-01-30 at c449ac74bf)
130
- + config: add back code comment
138
+* vd/for-each-ref-sort-with-formatted-timestamp (2024-02-07) 1 commit
139
+ - ref-filter.c: sort formatted dates by byte value
140
132
- Comment fix.
133
- source: <48d66e94ece3b763acbe933561d82157c02a5f58.1706466321.git.code@khaugsbakk.name>
141
+ "git branch" and friends learned to use the formatted text as
142
+ sorting key, not the underlying timestamp value, when the --sort
143
+ option is used with author or committer timestamp with a format
144
+ specifier (e.g., "--sort=creatordate:format:%H:%M:%S").
145
146
+ Will merge to 'next'.
147
+ source: <pull.1655.git.1707357439586.gitgitgadget@gmail.com>
148
136
-* ps/reftable-compacted-tables-permission-fix (2024-01-26) 1 commit
137
- (merged to 'next' on 2024-01-29 at dbb06e1571)
138
- + reftable/stack: adjust permissions of compacted tables
149
140
- Reftable bugfix.
141
- source: <a211818108053754aca002726d0206623a347952.1706263589.git.ps@pks.im>
150
+* vn/rebase-with-cherry-pick-authorship (2024-02-08) 1 commit
151
+ - sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands
152
153
+ "git cherry-pick" invoked during "git rebase -i" session lost
154
+ the authorship information, which has been corrected.
155
144
-* ps/tests-with-ref-files-backend (2024-01-29) 6 commits
145
- (merged to 'next' on 2024-01-30 at 376b9c9c1b)
146
- + t: mark tests regarding git-pack-refs(1) to be backend specific
147
- + t5526: break test submodule differently
148
- + t1419: mark test suite as files-backend specific
149
- + t1302: make tests more robust with new extensions
150
- + t1301: mark test for `core.sharedRepository` as reffiles specific
151
- + t1300: make tests more robust with non-default ref backends
152
- (this branch is used by ps/reftable-backend.)
156
+ Will merge to 'next'?
157
+ source: <0adb1068-ef10-44ed-ad1d-e0927a09245d@gmail.com>
158
154
- Prepare existing tests on refs to work better with non-default
155
- backends.
156
- source: <cover.1706525813.git.ps@pks.im>
159
160
+* jc/no-lazy-fetch (2024-02-08) 1 commit
161
+ - git: --no-lazy-fetch option
162
159
-* rj/test-with-leak-check (2024-01-29) 4 commits
160
- (merged to 'next' on 2024-01-31 at 76e4596666)
161
- + t0080: mark as leak-free
162
- + test-lib: check for TEST_PASSES_SANITIZE_LEAK
163
- + t6113: mark as leak-free
164
- + t5332: mark as leak-free
163
+ "git --no-lazy-fetch cmd" allows to run "cmd" while disabling lazy
164
+ fetching of objects from the promisor remote, which may be handy
165
+ for debugging.
166
166
- More tests that are supposed to pass leak sanitizer are marked as such.
167
- source: <45eb0748-6415-4e52-a54f-8d4e5ad57dde@gmail.com>
167
+ Needs review.
168
+ source: <xmqq1q9mmtpw.fsf@gitster.g>
169
170
170
-* tb/pack-bitmap-drop-unused-struct-member (2024-01-29) 1 commit
171
- (merged to 'next' on 2024-01-30 at f3749b15fc)
172
- + pack-bitmap: drop unused `reuse_objects`
171
+* jc/t9210-lazy-fix (2024-02-08) 1 commit
172
+ - t9210: do not rely on lazy fetching to fail
173
174
- Code clean-up.
175
- source: <0bbaf9a3591765161872fb71383263edb0c7ef83.1706328008.git.me@ttaylorr.com>
174
+ Adjust use of "rev-list --missing" in an existing tests so that it
175
+ does not depend on a buggy failure mode.
176
+
177
+ Needs review.
178
+ source: <xmqq7cjemttr.fsf@gitster.g>
179
180
--------------------------------------------------
178
-[New Topics]
181
+[Cooking]
182
183
* gt/at-is-synonym-for-head-in-add-patch (2024-02-03) 3 commits
184
- SQUASH???
@@ -184,6 +187,9 @@ Release tarballs are available at:
187
188
Teach "git checkout -p" and friends that "@" is a synonym for
189
"HEAD".
190
+
191
+ Expecting a reroll.
192
+ cf. <xmqqil31dqx6.fsf@gitster.g>
193
source: <20240202150434.11256-1-shyamthakkar001@gmail.com>
194
195
@@ -195,66 +201,99 @@ Release tarballs are available at:
201
- test-tool run-command testsuite: get shell from env
202
- t0080: turn t-basic unit test into a helper
203
- Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner
198
- (this branch uses jk/unit-tests-buildfix.)
204
205
The "test-tool" has been taught to run testsuite tests in parallel,
206
bypassing the need to use the "prove" tool.
207
+
208
+ Expecting a reroll.
209
+ cf. <20240207225802.GA538110@coredump.intra.peff.net>
210
source: <cover.1706921262.git.steadmon@google.com>
211
212
205
-* jc/sign-buffer-failure-propagation-fix (2024-02-06) 1 commit
206
- - tag: fix sign_buffer() call to create a signed tag
213
+* jc/sign-buffer-failure-propagation-fix (2024-02-07) 2 commits
214
+ (merged to 'next' on 2024-02-08 at badb96b5ac)
215
+ + ssh signing: signal an error with a negative return value
216
+ (merged to 'next' on 2024-02-07 at 2cedac9d38)
217
+ + tag: fix sign_buffer() call to create a signed tag
218
+
219
+ A failed "git tag -s" did not necessarily result in an error
220
+ depending on the crypto backend, which has been corrected.
221
+
222
+ Will merge to 'master'.
223
+ source: <xmqq4jek9ko1.fsf@gitster.g>
224
+ source: <xmqq5xyzr6tm.fsf@gitster.g>
225
226
227
* js/check-null-from-read-object-file (2024-02-06) 1 commit
228
- Always check the return value of `repo_read_object_file()`
229
230
+ The code paths that call repo_read_object_file() have been
231
+ tightened to react to errors.
232
+
233
+ Waiting for review responses.
234
+ cf. <CAO_smVhrMn=-uF1B6+RA8A+VLCEN=o57zbQPtr8hpxRKY=qJRQ@mail.gmail.com>
235
source: <pull.1650.git.1707143753726.gitgitgadget@gmail.com>
236
237
238
* pb/template-for-single-commit-pr (2024-02-06) 1 commit
216
- - .github/PULL_REQUEST_TEMPLATE.md: add a note about single-commit PRs
239
+ (merged to 'next' on 2024-02-07 at 2a56c8eb13)
240
+ + .github/PULL_REQUEST_TEMPLATE.md: add a note about single-commit PRs
241
242
+ Doc update.
243
+
244
+ Will merge to 'master'.
245
source: <pull.1665.v2.git.git.1707225612576.gitgitgadget@gmail.com>
246
247
248
* ps/report-failure-from-git-stash (2024-02-06) 1 commit
222
- - builtin/stash: report failure to write to index
249
+ (merged to 'next' on 2024-02-07 at a8a3f91f61)
250
+ + builtin/stash: report failure to write to index
251
252
+ "git stash" sometimes was silent even when it failed due to
253
+ unwritable index file, which has been corrected.
254
+
255
+ Will merge to 'master'.
256
source: <cb098cf88cbfcbf7c4872f8887856629b909cb91.1707197653.git.ps@pks.im>
257
258
259
* tb/multi-pack-reuse-experiment (2024-02-05) 2 commits
228
- - pack-objects: enable multi-pack reuse via `feature.experimental`
229
- - t5332-multi-pack-reuse.sh: extract pack-objects helper functions
260
+ (merged to 'next' on 2024-02-08 at e92afaa170)
261
+ + pack-objects: enable multi-pack reuse via `feature.experimental`
262
+ + t5332-multi-pack-reuse.sh: extract pack-objects helper functions
263
264
+ Setting `feature.experimental` opts the user into multi-pack reuse
265
+ experiment
266
+
267
+ Will merge to 'master'.
268
source: <cover.1707173415.git.me@ttaylorr.com>
269
233
---------------------------------------------------
234
-[Cooking]
270
236
-* ps/reftable-backend (2024-02-02) 3 commits
237
- - ci: add jobs to test with the reftable backend
238
- - refs: introduce reftable backend
239
- - Merge branch 'ps/tests-with-ref-files-backend' into ps/reftable-backend
271
+* ps/reftable-backend (2024-02-07) 3 commits
272
+ (merged to 'next' on 2024-02-08 at ba1c4c52bb)
273
+ + refs/reftable: fix leak when copying reflog fails
274
+ (merged to 'next' on 2024-02-07 at 1115200acb)
275
+ + ci: add jobs to test with the reftable backend
276
+ + refs: introduce reftable backend
277
278
Integrate the reftable code into the refs framework as a backend.
279
243
- Will merge to 'next'.
244
- source: <cover.1706862705.git.ps@pks.im>
280
+ Will cook in 'next'.
281
+ source: <cover.1707288261.git.ps@pks.im>
282
283
247
-* cc/rev-list-allow-missing-tips (2024-02-01) 3 commits
248
- - rev-list: add --allow-missing-tips to be used with --missing=...
249
- - t6022: fix 'even though' typo in comment
284
+* cc/rev-list-allow-missing-tips (2024-02-08) 4 commits
285
+ - rev-list: allow missing tips with --missing=[print|allow*]
286
+ - t6022: fix 'test' style and 'even though' typo
287
+ - oidset: refactor oidset_insert_from_set()
288
- revision: clarify a 'return NULL' in get_reference()
289
290
"git rev-list --missing=print" have learned to optionally take
291
"--allow-missing-tips", which allows the objects at the starting
292
points to be missing.
293
256
- Needs review.
257
- source: <20240201115809.1177064-1-christian.couder@gmail.com>
294
+ Comments?
295
+ cf. <xmqq7cjemttr.fsf@gitster.g>
296
+ source: <20240208135055.2705260-1-christian.couder@gmail.com>
297
298
299
* ps/reftable-iteration-perf (2024-02-01) 7 commits
@@ -269,87 +308,45 @@ Release tarballs are available at:
308
The code to iterate over refs with the reftable backend has seen
309
some optimization.
310
272
- Needs review.
311
+ Expecting a reroll.
312
+ cf. <Zbx6aDzXpYy4Is2t@tanuki>
313
source: <cover.1706782841.git.ps@pks.im>
314
315
316
* ps/reftable-styles (2024-02-06) 9 commits
277
- - reftable/record: improve semantics when initializing records
278
- - reftable/merged: refactor initialization of iterators
279
- - reftable/merged: refactor seeking of records
280
- - reftable/stack: use `size_t` to track stack length
281
- - reftable/stack: use `size_t` to track stack slices during compaction
282
- - reftable/stack: index segments with `size_t`
283
- - reftable/stack: fix parameter validation when compacting range
284
- - reftable: introduce macros to allocate arrays
285
- - reftable: introduce macros to grow arrays
317
+ (merged to 'next' on 2024-02-07 at 18670512e2)
318
+ + reftable/record: improve semantics when initializing records
319
+ + reftable/merged: refactor initialization of iterators
320
+ + reftable/merged: refactor seeking of records
321
+ + reftable/stack: use `size_t` to track stack length
322
+ + reftable/stack: use `size_t` to track stack slices during compaction
323
+ + reftable/stack: index segments with `size_t`
324
+ + reftable/stack: fix parameter validation when compacting range
325
+ + reftable: introduce macros to allocate arrays
326
+ + reftable: introduce macros to grow arrays
327
328
Code clean-up in various reftable code paths.
329
289
- Will merge to 'next'.
290
- source: <cover.1707200355.git.ps@pks.im>
291
-
292
-
293
-* pb/imap-send-wo-curl-build-fix (2024-02-01) 1 commit
294
- (merged to 'next' on 2024-02-05 at 18368f61a7)
295
- + imap-send: add missing "strbuf.h" include under NO_CURL
296
-
297
- Build fix.
298
-
330
Will merge to 'master'.
300
- source: <pull.1664.git.git.1706833113569.gitgitgadget@gmail.com>
301
-
302
-
303
-* jc/github-actions-update (2024-02-02) 1 commit
304
- - Merge branch 'jc/maint-github-actions-update' into jc/github-actions-update
305
- (this branch uses jc/maint-github-actions-update.)
306
-
307
- An evil merge of the other topic to a more modern codebase.
308
-
309
- Will merge to 'next'?
331
+ source: <cover.1707200355.git.ps@pks.im>
332
333
312
-* jc/maint-github-actions-update (2024-02-02) 2 commits
313
- - GitHub Actions: update to github-script@v7
314
- - GitHub Actions: update to checkout@v4
315
- (this branch is used by jc/github-actions-update.)
334
+* jc/github-actions-update (2024-02-02) 3 commits
335
+ (merged to 'next' on 2024-02-07 at 2cd6caaf70)
336
+ + Merge branch 'jc/maint-github-actions-update' into jc/github-actions-update
337
+ + GitHub Actions: update to github-script@v7
338
+ + GitHub Actions: update to checkout@v4
339
340
Squelch node.js 16 deprecation warnings from GitHub Actions CI
341
by updating actions/github-script and actions/checkout that use
342
node.js 20.
343
321
- Needs review.
322
- source: <20240202203935.1240458-1-gitster@pobox.com>
323
-
324
-
325
-* jh/sparse-index-expand-to-path-fix (2024-02-02) 1 commit
326
- (merged to 'next' on 2024-02-06 at 17ec59dd9a)
327
- + sparse-index: pass string length to index_file_exists()
328
-
329
- A caller called index_file_exists() that takes a string expressed
330
- as <ptr, length> with a wrong length, which has been corrected.
331
-
344
Will merge to 'master'.
333
- source: <pull.1649.git.1706897095273.gitgitgadget@gmail.com>
334
-
335
-
336
-* jk/unit-tests-buildfix (2024-02-02) 4 commits
337
- (merged to 'next' on 2024-02-02 at 8838dd21e8)
338
- + t/Makefile: say the default target upfront
339
- (merged to 'next' on 2024-01-31 at 00df31c4c8)
340
- + t/Makefile: get UNIT_TESTS list from C sources
341
- + Makefile: remove UNIT_TEST_BIN directory with "make clean"
342
- + Makefile: use mkdir_p_parent_template for UNIT_TEST_BIN
343
- (this branch is used by js/unit-test-suite-runner.)
344
-
345
- Build dependency around unit tests has been fixed.
346
-
347
- Will merge to 'master'.
348
- source: <20240130053714.GA165967@coredump.intra.peff.net>
349
- source: <xmqqjznmtjr9.fsf@gitster.g>
345
+ source: <20240202203935.1240458-1-gitster@pobox.com>
346
347
352
-* js/merge-tree-3-trees (2024-02-06) 5 commits
348
+* js/merge-tree-3-trees (2024-02-07) 6 commits
349
+ - cache-tree: avoid an unnecessary check
350
- Always check `parse_tree*()`'s return value
351
- t4301: verify that merge-tree fails on missing blob objects
352
- merge-ort: do check `parse_tree()`'s return value
@@ -360,20 +357,11 @@ Release tarballs are available at:
357
"git merge-tree" has learned that the three trees involved in the
358
3-way merge only need to be trees, not necessarily commits.
359
363
- Will cook in 'next'
360
+ Expecting a reroll.
361
+ cf. <CAPig+cSs8MFkLasTULh7tybrFm7SwaT+JeR7HnXjh+-agCHYMw@mail.gmail.com>
362
+ cf. <CAPig+cSJz3U+vT==NhX5hcrTjsCggnAzhzQOvZcSXbcEGuYaKQ@mail.gmail.com>
363
source: <pull.1647.v2.git.1706474063109.gitgitgadget@gmail.com>
365
- source: <pull.1651.git.1707212981.gitgitgadget@gmail.com>
366
-
367
-
368
-* mh/credential-oauth-refresh-token-with-wincred (2024-01-29) 1 commit
369
- (merged to 'next' on 2024-02-05 at 68880a751a)
370
- + credential/wincred: store oauth_refresh_token
371
-
372
- Teach wincred credential backend to support oauth refresh token the
373
- same way as credential-cache and credential-libsecret backends.
374
-
375
- Will merge to 'master'.
376
- source: <pull.1534.v3.git.1706477103039.gitgitgadget@gmail.com>
364
+ source: <pull.1651.v2.git.1707324461.gitgitgadget@gmail.com>
365
366
367
* pb/complete-config (2024-01-29) 5 commits
@@ -387,6 +375,7 @@ Release tarballs are available at:
375
complete configuration variable names better.
376
377
Needs review.
378
+ cf. <xmqq8r3w53nc.fsf@gitster.g>
379
source: <pull.1660.v2.git.git.1706534881.gitgitgadget@gmail.com>
380
381
@@ -403,70 +392,48 @@ Release tarballs are available at:
392
source: <98daf977-dbad-4d3b-a293-6a769895088f@gmail.com>
393
394
406
-* jc/index-pack-fsck-levels (2024-02-01) 2 commits
407
- (merged to 'next' on 2024-02-02 at 0e4ef26aa1)
408
- + index-pack: --fsck-objects to take an optional argument for fsck msgs
409
- + index-pack: test and document --strict=<msg-id>=<severity>...
410
-
411
- The "--fsck-objects" option of "git index-pack" now can take the
412
- optional parameter to tweak severity of different fsck errors.
413
-
414
- Will merge to 'master'.
415
- source: <pull.1658.v4.git.git.1706751483.gitgitgadget@gmail.com>
416
-
417
-
395
* ps/reftable-multi-level-indices-fix (2024-02-01) 6 commits
419
- - reftable: document reading and writing indices
420
- - reftable/writer: fix writing multi-level indices
421
- - reftable/writer: simplify writing index records
422
- - reftable/writer: use correct type to iterate through index entries
423
- - reftable/reader: be more careful about errors in indexed seeks
424
- - Merge branch 'jc/reftable-core-fsync' into ps/reftable-multi-level-indices-fix
396
+ (merged to 'next' on 2024-02-07 at 143f47a079)
397
+ + reftable: document reading and writing indices
398
+ + reftable/writer: fix writing multi-level indices
399
+ + reftable/writer: simplify writing index records
400
+ + reftable/writer: use correct type to iterate through index entries
401
+ + reftable/reader: be more careful about errors in indexed seeks
402
+ + Merge branch 'jc/reftable-core-fsync' into ps/reftable-multi-level-indices-fix
403
404
Write multi-level indices for reftable has been corrected.
405
428
- Will merge to 'next'.
429
- source: <cover.1706773842.git.ps@pks.im>
430
-
431
-
432
-* cp/unit-test-prio-queue (2024-01-22) 1 commit
433
- (merged to 'next' on 2024-02-01 at 38aa6559b0)
434
- + tests: move t0009-prio-queue.sh to the new unit testing framework
435
-
436
- Migrate priority queue test to unit testing framework.
437
-
406
Will merge to 'master'.
439
- source: <pull.1642.v4.git.1705865326185.gitgitgadget@gmail.com>
407
+ source: <cover.1706773842.git.ps@pks.im>
408
409
442
-* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-01-17) 2 commits
410
+* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-02-08) 2 commits
411
- revision: implement `git log --merge` also for rebase/cherry_pick/revert
412
- revision: ensure MERGE_HEAD is a ref in prepare_show_merge
413
414
"git log --merge" learned to pay attention to CHERRY_PICK_HEAD and
415
other kinds of *_HEAD pseudorefs.
416
449
- Comments?
450
- source: <xmqqzfxa9usx.fsf@gitster.g>
417
+ Will merge to 'next'?
418
+ source: <20240117081405.14012-1-mi.al.lohmann@gmail.com>
419
+ source: <dfb582cf-b1e4-414d-bfe1-0f93d910ec54@kdbg.org>
420
421
453
-* bk/complete-bisect (2024-01-29) 9 commits
454
- - SQUASH???
455
- - completion: add tests for git-bisect
456
- - completion: bisect: recognize but do not complete view subcommand
457
- - completion: bisect: complete log opts for visualize subcommand
458
- - completion: log: use __git_complete_log_opts
459
- - completion: new function __git_complete_log_opts
460
- - completion: bisect: complete missing --first-parent and --no-checkout options
461
- - completion: bisect: complete custom terms and related options
462
- - completion: bisect: complete bad, new, old, and help subcommands
422
+* bk/complete-bisect (2024-02-06) 7 commits
423
+ (merged to 'next' on 2024-02-07 at ac95a595b7)
424
+ + completion: bisect: recognize but do not complete view subcommand
425
+ + completion: bisect: complete log opts for visualize subcommand
426
+ + completion: new function __git_complete_log_opts
427
+ + completion: bisect: complete missing --first-parent and - -no-checkout options
428
+ + completion: bisect: complete custom terms and related options
429
+ + completion: bisect: complete bad, new, old, and help subcommands
430
+ + completion: tests: always use 'master' for default initial branch name
431
432
Command line completion support (in contrib/) has been
433
updated for "git bisect".
434
467
- Comments?
468
- cf. <ZaofJhHsFjRxx7a3@tanuki>
469
- source: <20240128223447.342493-1-britton.kerin@gmail.com>
435
+ Will merge to 'master'.
436
+ source: <20240206215048.488344-1-britton.kerin@gmail.com>
437
438
439
* bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit
@@ -476,7 +443,8 @@ Release tarballs are available at:
443
updated for a few commands to complete directory names where a
444
directory name is expected.
445
479
- Needs review.
446
+ Expecting a reroll.
447
+ cf. <40c3a824-a961-490b-94d4-4eb23c8f713d@gmail.com>
448
source: <d37781c3-6af2-409b-95a8-660a9b92d20b@smtp-relay.sendinblue.com>
449
450
@@ -488,6 +456,7 @@ Release tarballs are available at:
456
the command is used to send pre-generated files.
457
458
Needs review.
459
+ cf. <xmqq4jej6i1b.fsf@gitster.g>
460
source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com>
461
462
@@ -522,15 +491,14 @@ Release tarballs are available at:
491
- trailer: free trailer_info _after_ all related usage
492
493
Code clean-up.
525
-
526
- Needs review.
494
source: <pull.1632.v4.git.1707196348.gitgitgadget@gmail.com>
495
496
497
* cp/apply-core-filemode (2023-12-26) 3 commits
531
- - apply: code simplification
532
- - apply: correctly reverse patch's pre- and post-image mode bits
533
- - apply: ignore working tree filemode when !core.filemode
498
+ (merged to 'next' on 2024-02-07 at 089a3fbb86)
499
+ + apply: code simplification
500
+ + apply: correctly reverse patch's pre- and post-image mode bits
501
+ + apply: ignore working tree filemode when !core.filemode
502
503
"git apply" on a filesystem without filemode support have learned
504
to take a hint from what is in the index for the path, even when
@@ -538,28 +506,20 @@ Release tarballs are available at:
506
the executable bit match what is required by the preimage in the
507
patch.
508
541
- Needs review.
509
+ Will cook in 'next'.
510
+ cf. <xmqqzfwb53a9.fsf@gitster.g>
511
source: <20231226233218.472054-1-gitster@pobox.com>
512
513
545
-* ja/doc-placeholders-fix (2023-12-26) 2 commits
546
- (merged to 'next' on 2024-02-05 at 047da8cbb0)
547
- + doc: enforce placeholders in documentation
548
- + doc: enforce dashes in placeholders
549
-
550
- Docfix.
551
-
552
- Will merge to 'master'.
553
- source: <pull.1626.git.1703539287.gitgitgadget@gmail.com>
554
-
555
-
556
-* jc/bisect-doc (2023-12-09) 1 commit
557
- - bisect: document "terms" subcommand more fully
514
+* jc/bisect-doc (2024-02-07) 2 commits
515
+ (merged to 'next' on 2024-02-07 at 914fa6775f)
516
+ + bisect: document command line arguments for "bisect start"
517
+ + bisect: document "terms" subcommand more fully
518
519
Doc update.
520
561
- Needs review.
562
- source: <xmqqzfyjmk02.fsf@gitster.g>
521
+ Will merge to 'master'.
522
+ source: <20240207214436.538586-1-gitster@pobox.com>
523
524
525
* tb/path-filter-fix (2024-01-31) 16 commits
@@ -589,21 +549,6 @@ Release tarballs are available at:
549
source: <cover.1706741516.git.me@ttaylorr.com>
550
551
592
-* ak/color-decorate-symbols (2023-10-23) 7 commits
593
- - log: add color.decorate.pseudoref config variable
594
- - refs: exempt pseudorefs from pattern prefixing
595
- - refs: add pseudorefs array and iteration functions
596
- - log: add color.decorate.ref config variable
597
- - log: add color.decorate.symbol config variable
598
- - log: use designated inits for decoration_colors
599
- - config: restructure color.decorate documentation
600
-
601
- A new config for coloring.
602
-
603
- Needs review.
604
- source: <20231023221143.72489-1-andy.koppe@gmail.com>
605
-
606
-
552
* eb/hash-transition (2023-10-02) 30 commits
553
- t1016-compatObjectFormat: add tests to verify the conversion between objects
554
- t1006: test oid compatibility with cat-file
@@ -638,7 +583,8 @@ Release tarballs are available at:
583
584
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
585
641
- Needs review.
586
+ Will merge to and cook in 'next'?
587
+ cf. <xmqqv86z5359.fsf@gitster.g>
588
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
589
590
@@ -686,3 +632,19 @@ Release tarballs are available at:
632
633
Reverted out of 'next' to revamp its UI.
634
source: <20240129113527.607022-1-karthik.188@gmail.com>
635
+
636
+
637
+* ak/color-decorate-symbols (2023-10-23) 7 commits
638
+ - log: add color.decorate.pseudoref config variable
639
+ - refs: exempt pseudorefs from pattern prefixing
640
+ - refs: add pseudorefs array and iteration functions
641
+ - log: add color.decorate.ref config variable
642
+ - log: add color.decorate.symbol config variable
643
+ - log: use designated inits for decoration_colors
644
+ - config: restructure color.decorate documentation
645
+
646
+ A new config for coloring.
647
+
648
+ Ejected, to be rebuilt on updated kn/for-all-refs topic
649
+ cf. <xmqqcyt853vz.fsf@gitster.g>
650
+ source: <20231023221143.72489-1-andy.koppe@gmail.com>