What's cooking (2024/04 #05)
Junio C Hamano committed
Apr 12, 2024 at 15:21 UTC
d0dc5bf11493bc80fdb38414b85b98deffbac379
1 file changed
+261
-302
whats-cooking.txt
+261
-302
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2024, #04; Tue, 9)
3
-X-master-at: 91ec36f2cca02d33ab0ed6e87195c6fe801debae
4
-X-next-at: 1a5e3faff75d1d3622627d3820bc57b4c2728bc5
2
+Subject: What's cooking in git.git (Apr 2024, #05; Fri, 12)
3
+X-master-at: 8f7582d995682f785e80e344197cc715e6bc7d8e
4
+X-next-at: 346d391aac0a243ed73bad8a0e30123f5381affe
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2024, #04; Tue, 9)
7
+What's cooking in git.git (Apr 2024, #05; Fri, 12)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,215 +48,292 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* dg/myfirstobjectwalk-updates (2024-03-27) 5 commits
52
- (merged to 'next' on 2024-04-02 at effa6a98a6)
53
- + MyFirstObjectWalk: add stderr to pipe processing
54
- + MyFirstObjectWalk: fix description for counting omitted objects
55
- + MyFirstObjectWalk: fix filtered object walk
56
- + MyFirstObjectWalk: fix misspelled "builtins/"
57
- + MyFirstObjectWalk: use additional arg in config_fn_t
58
-
59
- Update a more recent tutorial doc.
60
- source: <cover.1711537370.git.dirk@gouders.net>
61
-
62
-
63
-* es/test-cron-safety (2024-03-31) 1 commit
64
- (merged to 'next' on 2024-04-02 at e383c8cfb2)
65
- + test-lib: fix non-functioning GIT_TEST_MAINT_SCHEDULER fallback
66
-
67
- The test script had an incomplete and ineffective attempt to avoid
68
- clobbering the testing user's real crontab (and its equivalents),
69
- which has been completed.
70
- source: <20240329222703.9343-1-ericsunshine@charter.net>
71
-
72
-
73
-* ja/doc-markup-updates (2024-03-29) 5 commits
74
- (merged to 'next' on 2024-04-02 at 69b015d7ce)
75
- + doc: git-clone: do not autoreference the manpage in itself
76
- + doc: git-clone: apply new documentation formatting guidelines
77
- + doc: git-init: apply new documentation formatting guidelines
78
- + doc: allow literal and emphasis format in doc vs help tests
79
- + doc: rework CodingGuidelines with new formatting rules
80
-
81
- Documentation rules has been explicitly described how to mark-up
82
- literal parts and a few manual pages have been updated as examples.
83
- source: <pull.1702.v2.git.1711711181.gitgitgadget@gmail.com>
84
-
85
-
86
-* jc/advice-sans-trailing-whitespace (2024-03-29) 1 commit
87
- (merged to 'next' on 2024-04-02 at 3cb0fda1bf)
88
- + advice: omit trailing whitespace
89
-
90
- The "hint:" messages given by the advice mechanism, when given a
91
- message with a blank line, left a line with trailing whitespace,
92
- which has been cleansed.
93
- source: <xmqq4jcooddp.fsf@gitster.g>
94
-
95
-
96
-* jc/apply-parse-diff-git-header-names-fix (2024-03-29) 3 commits
97
- (merged to 'next' on 2024-04-02 at d1fa726c41)
98
- + t4126: fix "funny directory name" test on Windows (again)
99
- (merged to 'next' on 2024-03-28 at a35de15836)
100
- + t4126: make sure a directory with SP at the end is usable
101
- (merged to 'next' on 2024-03-27 at d586367985)
102
- + apply: parse names out of "diff --git" more carefully
103
-
104
- "git apply" failed to extract the filename the patch applied to,
105
- when the change was about an empty file created in or deleted from
106
- a directory whose name ends with a SP, which has been corrected.
107
- source: <xmqqfrwlltjn.fsf@gitster.g>
108
- source: <xmqqh6gqt674.fsf_-_@gitster.g>
109
- source: <xmqq5xx50x8p.fsf_-_@gitster.g>
110
-
111
-
112
-* mg/editorconfig-makefile (2024-03-23) 1 commit
113
- (merged to 'next' on 2024-04-02 at 907b55579e)
114
- + editorconfig: add Makefiles to "text files"
115
-
116
- The .editorconfig file has been taught that a Makefile uses HT
117
- indentation.
118
- source: <20240322221813.13019-1-mg@max.gautier.name>
119
-
120
-
121
-* ps/pack-refs-auto (2024-03-25) 16 commits
122
- (merged to 'next' on 2024-04-02 at 1d76dc3648)
123
- + builtin/gc: pack refs when using `git maintenance run --auto`
124
- + builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
125
- + t6500: extract objects with "17" prefix
126
- + builtin/gc: move `struct maintenance_run_opts`
127
- + builtin/pack-refs: introduce new "--auto" flag
128
- + builtin/pack-refs: release allocated memory
129
- + refs/reftable: expose auto compaction via new flag
130
- + refs: remove `PACK_REFS_ALL` flag
131
- + refs: move `struct pack_refs_opts` to where it's used
132
- + t/helper: drop pack-refs wrapper
133
- + refs/reftable: print errors on compaction failure
134
- + reftable/stack: gracefully handle failed auto-compaction due to locks
135
- + reftable/stack: use error codes when locking fails during compaction
136
- + reftable/error: discern locked/outdated errors
137
- + reftable/stack: fix error handling in `reftable_stack_init_addition()`
138
- + Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto
139
- (this branch is used by jt/reftable-geometric-compaction.)
140
-
141
- "git pack-refs" learned the "--auto" option, which is a useful
142
- addition to be triggered from "git gc --auto".
143
-
144
- Acked-by: Karthik Nayak <karthik.188@gmail.com>
145
- cf. <CAOLa=ZRAEA7rSUoYL0h-2qfEELdbPHbeGpgBJRqesyhHi9Q6WQ@mail.gmail.com>
146
- source: <cover.1711360631.git.ps@pks.im>
147
-
148
-
149
-* rj/add-p-explicit-reshow (2024-03-29) 2 commits
150
- (merged to 'next' on 2024-04-02 at 05c7e930af)
151
- + add-patch: do not print hunks repeatedly
152
- + add-patch: introduce 'p' in interactive-patch
153
-
154
- "git add -p" and other "interactive hunk selection" UI has learned to
155
- skip showing the hunk immediately after it has already been shown, and
156
- an additional action to explicitly ask to reshow the current hunk.
157
- source: <a9c515fe-6664-4b5d-abca-d88fdd32a883@gmail.com>
158
-
159
-
160
-* rj/use-adv-if-enabled (2024-03-30) 3 commits
161
- (merged to 'next' on 2024-04-02 at 31d4453035)
162
- + add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO
163
- + add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC
164
- + add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE
165
-
166
- Use advice_if_enabled() API to rewrite a simple pattern to
167
- call advise() after checking advice_enabled().
168
- source: <46fba030-d7aa-49d2-88fa-e506850f7b6a@gmail.com>
51
+* ds/typofix-core-config-doc (2024-03-31) 1 commit
52
+ (merged to 'next' on 2024-04-02 at 79496fcfc4)
53
+ + config: fix some small capitalization issues, as spotted
54
+
55
+ Typofix.
56
+ source: <26135b06c48565ee8ac6dcfc1ef5431511e6202c.1711918168.git.dsimic@manjaro.org>
57
+
58
+
59
+* jc/checkout-detach-wo-tracking-report (2024-03-30) 1 commit
60
+ (merged to 'next' on 2024-04-04 at 161eca247d)
61
+ + checkout: omit "tracking" information on a detached HEAD
62
+
63
+ "git checkout/switch --detach foo", after switching to the detached
64
+ HEAD state, gave the tracking information for the 'foo' branch,
65
+ which was pointless.
66
+
67
+ Tested-by: M Hickford <mirth.hickford@gmail.com>
68
+ cf. <CAGJzqsmE9FDEBn=u3ge4LA3ha4fDbm4OWiuUbMaztwjELBd7ug@mail.gmail.com>
69
+ source: <xmqqa5mfl7ud.fsf@gitster.g>
70
+
71
+
72
+* jc/t2104-style-update (2024-04-02) 1 commit
73
+ (merged to 'next' on 2024-04-03 at 0449835479)
74
+ + t2104: style fixes
75
+
76
+ Coding style fixes.
77
+ source: <xmqqmsqb4ngg.fsf@gitster.g>
78
+
79
+
80
+* js/merge-tree-3-trees (2024-04-12) 1 commit
81
+ (merged to 'next' on 2024-04-12 at d4235d1f47)
82
+ + merge-tree: fix argument type of the `--merge-base` option
83
+
84
+ Match the option argument type in the help text to the correct type
85
+ updated by a recent series.
86
+ source: <pull.1717.git.1712923841235.gitgitgadget@gmail.com>
87
+
88
+
89
+* kn/clarify-update-ref-doc (2024-04-02) 2 commits
90
+ (merged to 'next' on 2024-04-02 at d1b9c5aa67)
91
+ + githooks: use {old,new}-oid instead of {old,new}-value
92
+ + update-ref: use {old,new}-oid instead of {old,new}value
93
+
94
+ Doc update, as a preparation to enhance "git update-ref --stdin".
95
+ source: <20240402064915.191104-1-knayak@gitlab.com>
96
+
97
+
98
+* ps/reftable-binsearch-updates (2024-04-03) 7 commits
99
+ (merged to 'next' on 2024-04-04 at 40e6d5a36b)
100
+ + reftable/block: avoid decoding keys when searching restart points
101
+ + reftable/record: extract function to decode key lengths
102
+ + reftable/block: fix error handling when searching restart points
103
+ + reftable/block: refactor binary search over restart points
104
+ + reftable/refname: refactor binary search over refnames
105
+ + reftable/basics: improve `binsearch()` test
106
+ + reftable/basics: fix return type of `binsearch()` to be `size_t`
107
+
108
+ Reftable code clean-up and some bugfixes.
109
+ source: <cover.1712123093.git.ps@pks.im>
110
+
111
+
112
+* rs/imap-send-use-xsnprintf (2024-04-02) 1 commit
113
+ (merged to 'next' on 2024-04-04 at 789ad853e1)
114
+ + imap-send: use xsnprintf to format command
115
+
116
+ Code clean-up and duplicate reduction.
117
+ source: <f9ad9f41-5b9b-474e-9818-f91fc937daae@web.de>
118
+
119
+
120
+* rs/mem-pool-size-t-safety (2024-03-31) 1 commit
121
+ (merged to 'next' on 2024-04-02 at 3517d48210)
122
+ + mem-pool: use st_add() in mem_pool_strvfmt()
123
+
124
+ size_t arithmetic safety.
125
+ source: <bbe00b9e-64d8-4ec8-a2b9-2c6917c72dbd@web.de>
126
+
127
+
128
+* rs/t-prio-queue-cleanup (2024-04-02) 1 commit
129
+ (merged to 'next' on 2024-04-04 at 7961c838ac)
130
+ + t-prio-queue: simplify using compound literals
131
+
132
+ t-prio-queue test has been cleaned up by using C99 compound
133
+ literals; this is meant to also serve as a weather-balloon to smoke
134
+ out folks with compilers who have trouble compiling code that uses
135
+ the feature.
136
+ source: <520da361-1b80-4ba3-87b2-86d6fdfc18b5@web.de>
137
+
138
+
139
+* tb/midx-write (2024-04-01) 5 commits
140
+ (merged to 'next' on 2024-04-05 at b4870116f7)
141
+ + midx-write.c: use `--stdin-packs` when repacking
142
+ + midx-write.c: check count of packs to repack after grouping
143
+ + midx-write.c: factor out common want_included_pack() routine
144
+ + midx-write: move writing-related functions from midx.c
145
+ + Merge branch 'rs/midx-use-strvec-pushf' into tb/midx-write
146
+
147
+ Code clean-up by splitting code responsible for writing midx files
148
+ into its own file.
149
+ source: <cover.1712006190.git.me@ttaylorr.com>
150
+
151
+
152
+* vs/complete-with-set-u-fix (2024-04-01) 2 commits
153
+ (merged to 'next' on 2024-04-02 at d8f6a511e8)
154
+ + completion: protect prompt against unset SHOWUPSTREAM in nounset mode
155
+ + completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode
156
+
157
+ Another "set -u" fix for the bash prompt (in contrib/) script.
158
+ source: <20240401190751.8676-1-ville.skytta@iki.fi>
159
160
--------------------------------------------------
161
[New Topics]
162
163
+* dd/t9604-use-posix-timezones (2024-04-10) 1 commit
164
+ - t9604: Fix test for musl libc and new Debian
165
+
166
+ The cvsimport tests required that the platform understands
167
+ traditional timezone notations like CST6CDT, which has been
168
+ updated to work on those systems as long as they understand
169
+ POSIX notation with explicit tz transition dates.
170
+
171
+ Will merge to 'next'.
172
+ source: <20240410032812.30476-1-congdanhqx@gmail.com>
173
+
174
+
175
+* jc/t2104-style-fixes (2024-04-09) 1 commit
176
+ (merged to 'next' on 2024-04-11 at 7678ec509b)
177
+ + t2104: style fixes
178
+
179
+ Test style fixes.
180
+
181
+ Will merge to 'master'.
182
+ source: <xmqqmsqb4ngg.fsf@gitster.g>
183
+
184
+
185
+* kn/update-ref-symrefs (2024-04-12) 8 commits
186
+ - SQUASH???
187
+ - refs: support symrefs in 'reference-transaction' hook
188
+ - update-ref: add support for symref-update
189
+ - update-ref: add support for symref-create
190
+ - files-backend: extract out `create_symref_lock`
191
+ - update-ref: add support for symref-delete
192
+ - update-ref: add support for symref-verify
193
+ - refs: accept symref values in `ref_transaction[_add]_update`
194
+
195
+ source: <20240412095908.1134387-1-knayak@gitlab.com>
196
+
197
+
198
+* pf/commitish-committish (2024-04-11) 1 commit
199
+ (merged to 'next' on 2024-04-12 at 7ef816cb64)
200
+ + typo: replace 'commitish' with 'committish'
201
+
202
+ Spellfix.
203
+
204
+ Will merge to 'master'.
205
+ source: <20240407212111.55362-1-Pi.L.D.Fisher@gmail.com>
206
+
207
+
208
+* pw/t3428-cleanup (2024-04-09) 3 commits
209
+ (merged to 'next' on 2024-04-11 at 3c40516874)
210
+ + t3428: restore coverage for "apply" backend
211
+ + t3428: use test_commit_message
212
+ + t3428: modernize test setup
213
+
214
+ Test cleanup.
215
+
216
+ Will merge to 'master'.
217
+ source: <pull.1713.git.1712676444.gitgitgadget@gmail.com>
218
+
219
+
220
+* ta/fast-import-parse-path-fix (2024-04-12) 8 commits
221
+ - fast-import: make comments more precise
222
+ - fast-import: forbid escaped NUL in paths
223
+ - fast-import: document C-style escapes for paths
224
+ - fast-import: improve documentation for path quoting
225
+ - fast-import: remove dead strbuf
226
+ - fast-import: allow unquoted empty path for root
227
+ - fast-import: directly use strbufs for paths
228
+ - fast-import: tighten path unquoting
229
+
230
+ The way "git fast-import" handles paths described in its input has
231
+ been tightened up and more clearly documented.
232
+
233
+ Will merge to 'next'?
234
+ source: <cover.1712907684.git.thalia@archibald.dev>
235
+
236
+
237
+* xx/rfc2822-date-format-in-doc (2024-04-12) 1 commit
238
+ - Documentation: fix typos describing date format
239
+
240
+ Docfix.
241
+
242
+ Will merge to 'next'?
243
+ source: <pull.1716.git.1712911876943.gitgitgadget@gmail.com>
244
+
245
+--------------------------------------------------
246
+[Cooking]
247
+
248
* rs/date-mode-pass-by-value (2024-04-05) 1 commit
174
- - date: make DATE_MODE thread-safe
249
+ (merged to 'next' on 2024-04-10 at cc3c17d31c)
250
+ + date: make DATE_MODE thread-safe
251
252
The codepaths that reach date_mode_from_type() have been updated to
253
pass "struct date_mode" by value to make them thread safe.
254
179
- Will merge to 'next'.
255
+ Will merge to 'master'.
256
source: <c6cb255a-72f0-4ac2-81a2-1d8e95570a81@web.de>
257
258
259
* rs/usage-fallback-to-show-message-format (2024-04-05) 1 commit
184
- - usage: report vsnprintf(3) failure
260
+ (merged to 'next' on 2024-04-10 at 9a34aed4d5)
261
+ + usage: report vsnprintf(3) failure
262
263
vreportf(), which is usede by error() and friends, has been taught
264
to give the error message printf-format string when its vsnprintf()
265
call fails, instead of showing nothing useful to identify the
266
nature of the error.
267
191
- Will merge to 'next'.
268
+ Will merge to 'master'.
269
source: <3da13298-b6a6-4391-b8e8-5dae9a28b860@web.de>
270
271
272
* jc/local-extern-shell-rules (2024-04-05) 8 commits
196
- - t1016: local VAR="VAL" fix
197
- - t0610: local VAR="VAL" fix
198
- - t: teach lint that RHS of 'local VAR=VAL' needs to be quoted
199
- - t: local VAR="VAL" (quote ${magic-reference})
200
- - t: local VAR="VAL" (quote command substitution)
201
- - t: local VAR="VAL" (quote positional parameters)
202
- - CodingGuidelines: quote assigned value in 'local var=$val'
203
- - CodingGuidelines: describe "export VAR=VAL" rule
273
+ (merged to 'next' on 2024-04-10 at d3a13273e7)
274
+ + t1016: local VAR="VAL" fix
275
+ + t0610: local VAR="VAL" fix
276
+ + t: teach lint that RHS of 'local VAR=VAL' needs to be quoted
277
+ + t: local VAR="VAL" (quote ${magic-reference})
278
+ + t: local VAR="VAL" (quote command substitution)
279
+ + t: local VAR="VAL" (quote positional parameters)
280
+ + CodingGuidelines: quote assigned value in 'local var=$val'
281
+ + CodingGuidelines: describe "export VAR=VAL" rule
282
283
Document and apply workaround for a buggy version of dash that
284
mishandles "local var=val" construct.
285
208
- Will merge to 'next'.
286
+ Will merge to 'master'.
287
source: <20240406000902.3082301-1-gitster@pobox.com>
288
289
290
* jc/unleak-core-excludesfile (2024-04-08) 1 commit
213
- - config: do not leak excludes_file
291
+ (merged to 'next' on 2024-04-10 at ffb0c01871)
292
+ + config: do not leak excludes_file
293
294
The variable that holds the value read from the core.excludefile
295
configuration variable used to leak, which has been corrected.
296
218
- Will merge to 'next'.
297
+ Will merge to 'master'.
298
source: <xmqqttkeicov.fsf@gitster.g>
299
300
222
-* la/doc-use-of-contacts-when-contributing (2024-04-05) 8 commits
301
+* la/doc-use-of-contacts-when-contributing (2024-04-12) 8 commits
302
- SubmittingPatches: demonstrate using git-contacts with git-send-email
303
- SubmittingPatches: add heading for format-patch and send-email
304
- SubmittingPatches: dedupe discussion of security patches
305
- SubmittingPatches: discuss reviewers first
306
- SubmittingPatches: quote commands
307
- SubmittingPatches: mention GitGitGadget
229
- - SubmittingPatches: make 'git contacts' grep-friendly
308
+ - SubmittingPatches: clarify 'git-contacts' location
309
- MyFirstContribution: mention contrib/contacts/git-contacts
310
311
Advertise "git contacts", a tool for newcomers to find people to
312
ask review for their patches, a bit more in our developer
313
documentation.
314
236
- Expecting a reroll.
237
- cf. <owlypluzs5qa.fsf@fine.c.googlers.com>
238
- source: <pull.1704.v2.git.1712366536.gitgitgadget@gmail.com>
315
+ source: <pull.1704.v4.git.1712878339.gitgitgadget@gmail.com>
316
317
241
-* ps/ci-test-with-jgit (2024-04-08) 12 commits
318
+* ps/ci-test-with-jgit (2024-04-12) 13 commits
319
- t0612: add tests to exercise Git/JGit reftable compatibility
320
- t0610: fix non-portable variable assignment
321
- t06xx: always execute backend-specific tests
322
- ci: install JGit dependency
323
- ci: make Perforce binaries executable for all users
324
- ci: merge scripts which install dependencies
325
+ - ci: fix setup of custom path for GitLab CI
326
- ci: merge custom PATH directories
327
- ci: convert "install-dependencies.sh" to use "/bin/sh"
328
- ci: drop duplicate package installation for "linux-gcc-default"
251
- - ci: allow skipping sudo on dockerized jobs
329
+ - ci: skip sudo when we are already root
330
- ci: expose distro name in dockerized GitHub jobs
331
- ci: rename "runs_on_pool" to "distro"
332
333
Tests to ensure interoperability between reftable written by jgit
334
and our code have been added and enabled in CI.
335
258
- Comments?
259
- source: <cover.1712555682.git.ps@pks.im>
336
+ source: <cover.1712896868.git.ps@pks.im>
337
338
339
* pw/rebase-i-error-message (2024-04-08) 2 commits
@@ -272,28 +349,28 @@ Release tarballs are available at:
349
350
351
* tb/make-indent-conditional-with-non-spaces (2024-04-08) 2 commits
275
- - Makefile(s): do not enforce "all indents must be done with tab"
276
- - Makefile(s): avoid recipe prefix in conditional statements
352
+ (merged to 'next' on 2024-04-10 at 98aa239dc3)
353
+ + Makefile(s): do not enforce "all indents must be done with tab"
354
+ + Makefile(s): avoid recipe prefix in conditional statements
355
356
Adjust to an upcoming changes to GNU make that breaks our Makefiles.
357
280
- Will merge to 'next'.
358
+ Will merge to 'master'.
359
source: <9d14c08ca6cc06cdf8fb4ba33d2470053dca3966.1712591504.git.me@ttaylorr.com>
360
361
362
* ps/t0610-umask-fix (2024-04-09) 2 commits
285
- - t0610: execute git-pack-refs(1) with specified umask
286
- - t0610: make `--shared=` tests reusable
363
+ (merged to 'next' on 2024-04-10 at 659a29b138)
364
+ + t0610: execute git-pack-refs(1) with specified umask
365
+ + t0610: make `--shared=` tests reusable
366
367
The "shared repository" test in the t0610 reftable test failed
368
under restrictive umask setting (e.g. 007), which has been
369
corrected.
370
292
- Will merge to 'next'.
371
+ Will merge to 'master'.
372
source: <cover.1712656576.git.ps@pks.im>
373
295
---------------------------------------------------
296
-[Cooking]
374
375
* ma/win32-unix-domain-socket (2024-04-03) 1 commit
376
(merged to 'next' on 2024-04-09 at b98021a65c)
@@ -324,16 +401,15 @@ Release tarballs are available at:
401
source: <cover.1712578837.git.ps@pks.im>
402
403
327
-* ds/send-email-per-message-block (2024-04-08) 3 commits
328
- - send-email: separate the confirmation prompts from the messages
404
+* ds/send-email-per-message-block (2024-04-10) 2 commits
405
- send-email: make it easy to discern the messages for each patch
330
- - send-email: move newline character out of a translatable string
406
+ - send-email: move newline characters out of a few translatable strings
407
408
"git send-email" learned to separate its reports on each message it
409
sends out with an extra blank line in between.
410
411
Comments?
336
- source: <cover.1712486910.git.dsimic@manjaro.org>
412
+ source: <cover.1712732383.git.dsimic@manjaro.org>
413
414
415
* ds/fetch-config-parse-microfix (2024-04-05) 1 commit
@@ -372,107 +448,40 @@ Release tarballs are available at:
448
source: <5ba55ee4-94c7-4094-a744-584fc623b391@web.de>
449
450
375
-* kn/clarify-update-ref-doc (2024-04-02) 2 commits
376
- (merged to 'next' on 2024-04-02 at d1b9c5aa67)
377
- + githooks: use {old,new}-oid instead of {old,new}-value
378
- + update-ref: use {old,new}-oid instead of {old,new}value
379
-
380
- Doc update, as a preparation to enhance "git update-ref --stdin".
381
-
382
- Will merge to 'master'.
383
- source: <20240402064915.191104-1-knayak@gitlab.com>
384
-
385
-
386
-* vs/complete-with-set-u-fix (2024-04-01) 2 commits
387
- (merged to 'next' on 2024-04-02 at d8f6a511e8)
388
- + completion: protect prompt against unset SHOWUPSTREAM in nounset mode
389
- + completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode
390
-
391
- Another "set -u" fix for the bash prompt (in contrib/) script.
392
-
393
- Will merge to 'master'.
394
- source: <20240401190751.8676-1-ville.skytta@iki.fi>
395
-
396
-
451
* ba/osxkeychain-updates (2024-04-01) 4 commits
398
- - osxkeychain: store new attributes
399
- - osxkeychain: erase matching passwords only
400
- - osxkeychain: erase all matching credentials
401
- - osxkeychain: replace deprecated SecKeychain API
452
+ (merged to 'next' on 2024-04-10 at 1e7d925a43)
453
+ + osxkeychain: store new attributes
454
+ + osxkeychain: erase matching passwords only
455
+ + osxkeychain: erase all matching credentials
456
+ + osxkeychain: replace deprecated SecKeychain API
457
458
Update osxkeychain backend with features required for the recent
459
credential subsystem.
460
406
- Will merge to 'next'?
407
- source: <pull.1667.git.1708212896.gitgitgadget@gmail.com>
408
-
409
-
410
-* rs/imap-send-use-xsnprintf (2024-04-02) 1 commit
411
- (merged to 'next' on 2024-04-04 at 789ad853e1)
412
- + imap-send: use xsnprintf to format command
413
-
414
- Code clean-up and duplicate reduction.
415
-
416
- Will merge to 'master'.
417
- source: <f9ad9f41-5b9b-474e-9818-f91fc937daae@web.de>
418
-
419
-
420
-* tb/midx-write (2024-04-01) 5 commits
421
- (merged to 'next' on 2024-04-05 at b4870116f7)
422
- + midx-write.c: use `--stdin-packs` when repacking
423
- + midx-write.c: check count of packs to repack after grouping
424
- + midx-write.c: factor out common want_included_pack() routine
425
- + midx-write: move writing-related functions from midx.c
426
- + Merge branch 'rs/midx-use-strvec-pushf' into tb/midx-write
427
-
428
- Code clean-up by splitting code responsible for writing midx files
429
- into its own file.
430
-
431
- Will merge to 'master'.
432
- source: <cover.1712006190.git.me@ttaylorr.com>
433
-
434
-
435
-* jc/t2104-style-update (2024-04-02) 1 commit
436
- (merged to 'next' on 2024-04-03 at 0449835479)
437
- + t2104: style fixes
438
-
439
- Coding style fixes.
440
-
441
- Will merge to 'master'.
442
- source: <xmqqmsqb4ngg.fsf@gitster.g>
443
-
444
-
445
-* rs/t-prio-queue-cleanup (2024-04-02) 1 commit
446
- (merged to 'next' on 2024-04-04 at 7961c838ac)
447
- + t-prio-queue: simplify using compound literals
448
-
449
- t-prio-queue test has been cleaned up by using C99 compound
450
- literals; this is meant to also serve as a weather-balloon to smoke
451
- out folks with compilers who have trouble compiling code that uses
452
- the feature.
453
-
461
Will merge to 'master'.
455
- source: <520da361-1b80-4ba3-87b2-86d6fdfc18b5@web.de>
462
+ source: <pull.1667.git.1708212896.gitgitgadget@gmail.com>
463
464
465
* jk/libcurl-8.7-regression-workaround (2024-04-05) 3 commits
459
- - remote-curl: add Transfer-Encoding header only for older curl
460
- - INSTALL: bump libcurl version to 7.21.3
461
- - http: reset POSTFIELDSIZE when clearing curl handle
466
+ (merged to 'next' on 2024-04-10 at 3b76577bfc)
467
+ + remote-curl: add Transfer-Encoding header only for older curl
468
+ + INSTALL: bump libcurl version to 7.21.3
469
+ + http: reset POSTFIELDSIZE when clearing curl handle
470
471
Fix was added to work around a regression in libcURL 8.7.0 (which has
472
already been fixed in their tip of the tree).
473
466
- Will merge to 'next'.
474
+ Will merge to 'master'.
475
source: <20240402200254.GA874754@coredump.intra.peff.net>
476
477
478
* tb/t7700-fixup (2024-04-03) 1 commit
471
- - t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1 `
479
+ (merged to 'next' on 2024-04-10 at ff1f877ef7)
480
+ + t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1 `
481
482
Test fix.
483
475
- Will merge to 'next'.
484
+ Will merge to 'master'.
485
source: <7e8d435d58eea19d2aae0be366720f5956d29a5d.1712075189.git.me@ttaylorr.com>
486
487
@@ -491,52 +500,18 @@ Release tarballs are available at:
500
501
502
* jt/reftable-geometric-compaction (2024-04-08) 4 commits
494
- - reftable/stack: use geometric table compaction
495
- - reftable/stack: add env to disable autocompaction
496
- - reftable/stack: expose option to disable auto-compaction
497
- - Merge branch 'ps/pack-refs-auto' into jt/reftable-geometric-compaction
503
+ (merged to 'next' on 2024-04-10 at 7e868a831c)
504
+ + reftable/stack: use geometric table compaction
505
+ + reftable/stack: add env to disable autocompaction
506
+ + reftable/stack: expose option to disable auto-compaction
507
+ + Merge branch 'ps/pack-refs-auto' into jt/reftable-geometric-compaction
508
509
The strategy to compact multiple tables of reftables after many
510
operations accumulate many entries has been improved to avoid
511
accumulating too many tables uncollected.
512
503
- Comments?
504
- source: <pull.1683.v6.git.1712593016.gitgitgadget@gmail.com>
505
-
506
-
507
-* ds/typofix-core-config-doc (2024-03-31) 1 commit
508
- (merged to 'next' on 2024-04-02 at 79496fcfc4)
509
- + config: fix some small capitalization issues, as spotted
510
-
511
- Typofix.
512
-
513
- Will merge to 'master'.
514
- source: <26135b06c48565ee8ac6dcfc1ef5431511e6202c.1711918168.git.dsimic@manjaro.org>
515
-
516
-
517
-* jc/checkout-detach-wo-tracking-report (2024-03-30) 1 commit
518
- (merged to 'next' on 2024-04-04 at 161eca247d)
519
- + checkout: omit "tracking" information on a detached HEAD
520
-
521
- "git checkout/switch --detach foo", after switching to the detached
522
- HEAD state, gave the tracking information for the 'foo' branch,
523
- which was pointless.
524
-
525
- Tested-by: M Hickford <mirth.hickford@gmail.com>
526
- cf. <CAGJzqsmE9FDEBn=u3ge4LA3ha4fDbm4OWiuUbMaztwjELBd7ug@mail.gmail.com>
527
-
528
- Will merge to 'master'.
529
- source: <xmqqa5mfl7ud.fsf@gitster.g>
530
-
531
-
532
-* rs/mem-pool-size-t-safety (2024-03-31) 1 commit
533
- (merged to 'next' on 2024-04-02 at 3517d48210)
534
- + mem-pool: use st_add() in mem_pool_strvfmt()
535
-
536
- size_t arithmetic safety.
537
-
513
Will merge to 'master'.
539
- source: <bbe00b9e-64d8-4ec8-a2b9-2c6917c72dbd@web.de>
514
+ source: <pull.1683.v6.git.1712593016.gitgitgadget@gmail.com>
515
516
517
* ew/khash-to-khashl (2024-03-28) 3 commits
@@ -592,22 +567,6 @@ Release tarballs are available at:
567
source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>
568
569
595
-* ps/reftable-binsearch-updates (2024-04-03) 7 commits
596
- (merged to 'next' on 2024-04-04 at 40e6d5a36b)
597
- + reftable/block: avoid decoding keys when searching restart points
598
- + reftable/record: extract function to decode key lengths
599
- + reftable/block: fix error handling when searching restart points
600
- + reftable/block: refactor binary search over restart points
601
- + reftable/refname: refactor binary search over refnames
602
- + reftable/basics: improve `binsearch()` test
603
- + reftable/basics: fix return type of `binsearch()` to be `size_t`
604
-
605
- Reftable code clean-up and some bugfixes.
606
-
607
- Will merge to 'master'.
608
- source: <cover.1712123093.git.ps@pks.im>
609
-
610
-
570
* tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits
571
- t/perf: implement performace tests for pseudo-merge bitmaps
572
- pseudo-merge: implement support for finding existing merges
@@ -697,8 +656,7 @@ Release tarballs are available at:
656
source: <20240319183722.211300-1-ignacio@iencinas.com>
657
658
700
-* js/build-fuzz-more-often (2024-03-05) 3 commits
701
- - SQUASH???
659
+* js/build-fuzz-more-often (2024-04-11) 2 commits
660
- fuzz: link fuzz programs with `make all` on Linux
661
- ci: also define CXX environment variable
662
@@ -706,20 +664,21 @@ Release tarballs are available at:
664
that are used in fuzzer tests, to make sure at least they build
665
without bitrot, in Linux CI runs.
666
709
- Stalled.
710
- cf. <xmqq1q7w8xx6.fsf@gitster.g>
711
- source: <cover.1709673020.git.steadmon@google.com>
667
+ Expecting a hopefully minor and final reroll.
668
+ cf. <20240412042247.GA1077925@coredump.intra.peff.net>
669
+ source: <cover.1712858920.git.steadmon@google.com>
670
671
672
* sj/userdiff-c-sharp (2024-04-05) 1 commit
715
- - userdiff: better method/property matching for C#
673
+ (merged to 'next' on 2024-04-10 at 56aaf254a7)
674
+ + userdiff: better method/property matching for C#
675
676
The userdiff patterns for C# has been updated.
677
678
Acked-by: Johannes Sixt <j6t@kdbg.org>
679
cf. <c2154457-3f2f-496e-9b8b-c8ea7257027b@kdbg.org>
680
722
- Will merge to 'next'.
681
+ Will merge to 'master'.
682
source: <pull.1682.v5.git.git.1712180564927.gitgitgadget@gmail.com>
683
684