What's cooking (2025/05 #08)
Junio C Hamano committed
May 27, 2025 at 15:46 UTC
55e80e19c3e67e877732a7b44cf4f22a8eaa9ac6
1 file changed
+228
-265
whats-cooking.txt
+228
-265
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2025, #07; Fri, 23)
3
-X-master-at: 845c48a16a7f7b2c44d8cb137b16a4a1f0140229
4
-X-next-at: 31b7d2e469bae1b76141d549de1a8d30046d582b
2
+Subject: What's cooking in git.git (May 2025, #08; Tue, 27)
3
+X-master-at: 34673cd0e81df9ccc075dd5e25ec92bf3128b3e9
4
+X-next-at: 18f40f098490df7274eac84a9df73a9b0d5fb848
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2025, #07; Fri, 23)
7
+What's cooking in git.git (May 2025, #08; Tue, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,104 +45,252 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[New Topics]
50
+
51
+* ja/doc-synopsis-style (2025-05-27) 9 commits
52
+ - doc: convert git-switch manpage to new synopsis style
53
+ - doc: convert git-mergetool options to new synopsis style
54
+ - doc: convert git-mergetool manpage to new synopsis style
55
+ - doc: switch merge config description to new synopsis format
56
+ - doc: convert merge strategies to synopsis format
57
+ - doc: merge-options.adoc remove a misleading double negation
58
+ - doc: convert merge options to new synopsis format
59
+ - doc: convert git-merge manpage to new style
60
+ - doc: convert git-checkout manpage to new style
61
+
62
+ Doc mark-up fixes.
63
+
64
+ Will merge to 'next'?
65
+ source: <pull.1927.git.1748204829.gitgitgadget@gmail.com>
66
+
67
+
68
+* ps/maintenance-ref-lock (2025-05-27) 11 commits
69
+ - builtin/maintenance: fix locking race when handling "gc" task
70
+ - builtin/gc: avoid global state in `gc_before_repack()`
71
+ - builtin/maintenance: fix locking race when packing refs and reflogs
72
+ - builtin/maintenance: let tasks do maintenance before and after detach
73
+ - builtin/maintenance: fix typedef for function pointers
74
+ - builtin/maintenance: extract function to run tasks
75
+ - builtin/maintenance: stop modifying global array of tasks
76
+ - builtin/maintenance: mark "--task=" and "--schedule=" as incompatible
77
+ - builtin/maintenance: centralize configuration of explicit tasks
78
+ - builtin/gc: drop redundant local variable
79
+ - builtin/gc: use designated field initializers for maintenance tasks
80
+
81
+ "git maintenance" lacked the care "git gc" had to avoid holding
82
+ onto the repository lock for too long during packing refs, which
83
+ has been remedied.
84
+
85
+ Comments?
86
+ source: <20250527-b4-pks-maintenance-ref-lock-race-v1-0-e1ceb2dea66e@pks.im>
87
+
88
+
89
+* tb/prepare-midx-pack-cleanup (2025-05-27) 6 commits
90
+ - midx: return a `packed_git` pointer from `prepare_midx_pack()`
91
+ - midx-write.c: extract inner loop from fill_packs_from_midx()
92
+ - midx-write.c: simplify fill_packs_from_midx()
93
+ - midx-write.c: guard against incremental MIDXs in want_included_pack()
94
+ - pack-bitmap.c: fix broken warning() when missing MIDX'd pack
95
+ - Merge branch 'ps/midx-negative-packfile-cache' into tb/prepare-midx-pack-cleanup
96
+ (this branch uses ps/midx-negative-packfile-cache.)
97
+
98
+ Improvement on Multi-pack-index API.
99
+
100
+ Comments?
101
+ source: <cover.1748198489.git.me@ttaylorr.com>
102
+
103
--------------------------------------------------
104
[Graduated to 'master']
105
51
-* ag/send-email-hostname-f (2025-05-13) 1 commit
52
- (merged to 'next' on 2025-05-16 at d5aa175e7d)
53
- + send-email: try to get fqdn by running hostname -f on Linux and macOS
106
+* ds/sparse-apply-add-p (2025-05-16) 4 commits
107
+ (merged to 'next' on 2025-05-21 at 933f316786)
108
+ + p2000: add performance test for patch-mode commands
109
+ + reset: integrate sparse index with --patch
110
+ + git add: make -p/-i aware of sparse index
111
+ + apply: integrate with the sparse index
112
+
113
+ "git apply" and "git add -i/-p" code paths no longer unnecessarily
114
+ expand sparse-index while working.
115
+ source: <pull.1914.v2.git.1747407330.gitgitgadget@gmail.com>
116
+
117
+
118
+* en/merge-tree-check (2025-05-16) 2 commits
119
+ (merged to 'next' on 2025-05-19 at c3278b91fa)
120
+ + merge-tree: add a new --quiet flag
121
+ + merge-ort: add a new mergeability_only option
122
+
123
+ "git merge-tree" learned an option to see if it resolves cleanly
124
+ without actually creating a result.
125
+ source: <pull.1920.v4.git.1747425858.gitgitgadget@gmail.com>
126
55
- Teach "git send-email" to also consult `hostname -f` for mail
56
- domain to compute the identity given to SMTP servers.
57
- source: <PN3PR01MB959701F40F805351472EA4CCB897A@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
127
128
+* en/sequencer-comment-messages (2025-05-16) 1 commit
129
+ (merged to 'next' on 2025-05-21 at b6516794fb)
130
+ + sequencer: make it clearer that commit descriptions are just comments
131
+
132
+ Prefix '#' to the commit title in the "rebase -i" todo file, just
133
+ like a merge commit being replayed.
134
+ source: <pull.1923.v2.git.1747412786573.gitgitgadget@gmail.com>
135
60
-* ds/scalar-no-maintenance (2025-05-14) 5 commits
61
- (merged to 'next' on 2025-05-16 at f9364331c0)
62
- + scalar reconfigure: improve --maintenance docs
63
- (merged to 'next' on 2025-05-08 at 1006cdd399)
64
- + scalar reconfigure: add --maintenance=<mode> option
65
- + scalar clone: add --no-maintenance option
66
- + scalar register: add --no-maintenance option
67
- + scalar: customize register_dir()'s behavior
136
69
- Two "scalar" subcommands that adds a repository that hasn't been
70
- under "scalar"'s control are taught an option not to enable the
71
- scheduled maintenance on it.
72
- source: <pull.1913.v3.git.1746582637.gitgitgadget@gmail.com>
137
+* es/meson-configure-build-options-fix (2025-05-19) 1 commit
138
+ (merged to 'next' on 2025-05-21 at b468031e13)
139
+ + meson: reformat default options to workaround bug in `meson configure`
140
141
+ Build procedure updates.
142
+ source: <20250519170945.57746-1-eschwartz@gentoo.org>
143
75
-* en/replay-wo-the-repository (2025-05-14) 1 commit
76
- (merged to 'next' on 2025-05-16 at 23608dbaab)
77
- + replay: replace the_repository with repo parameter passed to cmd_replay ()
144
79
- The dependency on the_repository variable has been reduced from the
80
- code paths in "git replay".
81
- source: <pull.1921.git.1747254806067.gitgitgadget@gmail.com>
145
+* jc/doc-synopsis-option-markup (2025-05-12) 4 commits
146
+ (merged to 'next' on 2025-05-21 at cb897d1302)
147
+ + git-var doc: fix usage of $ENV_VAR vs ENV_VAR
148
+ + git-verify-* doc: update mark-up of synopsis option descriptions
149
+ + git-{var,write-tree} docs: update mark-up of synopsis option descriptions
150
+ + git-daemon doc: update mark-up of synopsis option descriptions
151
152
+ Doc mark-up fixes.
153
+ source: <20250510123346.20927-1-jn.avila@free.fr>
154
84
-* js/ci-build-win-in-release-mode (2025-05-05) 1 commit
85
- (merged to 'next' on 2025-05-22 at 213a3f0262)
86
- + ci(win+Meson): build in Release mode
155
88
- win+Meson CI pipeline, unlike other pipelines for Windows,
89
- used to build artifacts in develper mode, which has been changed to
90
- build them in release mode for consistency.
91
- source: <pull.1908.v2.git.1746282346370.gitgitgadget@gmail.com>
156
+* jk/no-funny-object-types (2025-05-16) 13 commits
157
+ (merged to 'next' on 2025-05-19 at 4c995dbd23)
158
+ + object-file: drop support for writing objects with unknown types
159
+ + hash-object: handle --literally with OPT_NEGBIT
160
+ + hash-object: merge HASH_* and INDEX_* flags
161
+ + hash-object: stop allowing unknown types
162
+ + t: add lib-loose.sh
163
+ + t/helper: add zlib test-tool
164
+ + oid_object_info(): drop type_name strbuf
165
+ + fsck: stop using object_info->type_name strbuf
166
+ + oid_object_info_convert(): stop using string for object type
167
+ + cat-file: use type enum instead of buffer for -t option
168
+ + object-file: drop OBJECT_INFO_ALLOW_UNKNOWN_TYPE flag
169
+ + cat-file: make --allow-unknown-type a noop
170
+ + object-file.h: fix typo in variable declaration
171
172
+ Support to create a loose object file with unknown object type has
173
+ been dropped.
174
+ source: <20250516044916.GA21985@coredump.intra.peff.net>
175
94
-* lo/json-writer-docs (2025-05-16) 2 commits
95
- (merged to 'next' on 2025-05-16 at ab81da1b16)
96
- + json-writer: describe the usage of jw_* functions
97
- + json-writer: add docstrings to jw_* functions
176
99
- In-code docstring updates.
100
- source: <20250516010159.27042-1-lucasseikioshiro@gmail.com>
177
+* js/misc-fixes (2025-05-15) 11 commits
178
+ (merged to 'next' on 2025-05-21 at e803806107)
179
+ + sequencer: stop pretending that an assignment is a condition
180
+ + bundle-uri: avoid using undefined output of `sscanf()`
181
+ + commit-graph: avoid using stale stack addresses
182
+ + trace2: avoid "futile conditional"
183
+ + Avoid redundant conditions
184
+ + fetch: avoid unnecessary work when there is no current branch
185
+ + has_dir_name(): make code more obvious
186
+ + upload-pack: rename `enum` to reflect the operation
187
+ + commit-graph: avoid malloc'ing a local variable
188
+ + fetch: carefully clear local variable's address after use
189
+ + commit: simplify code
190
191
+ Assorted fixes for issues found with CodeQL.
192
+ source: <pull.1891.git.1747314709.gitgitgadget@gmail.com>
193
103
-* ly/pack-bitmap-load-leakfix (2025-05-12) 1 commit
104
- (merged to 'next' on 2025-05-14 at 0be31eac6b)
105
- + pack-bitmap: fix memory leak if `load_bitmap_entries_v1` failed
194
+
195
+* kj/my-first-contribution-updates (2025-05-19) 3 commits
196
+ (merged to 'next' on 2025-05-21 at f8c92423fb)
197
+ + docs: replace git_config to repo_config
198
+ + docs: clarify cmd_psuh signature and explain UNUSED macro
199
+ + docs: remove unused mentoring mailing list reference
200
+
201
+ Doc updates.
202
+ source: <20250518074317.73367-1-jayatheerthkulkarni2005@gmail.com>
203
+
204
+
205
+* ly/commit-graph-fill-oids-leakfix (2025-05-15) 1 commit
206
+ (merged to 'next' on 2025-05-19 at 972bbc7c11)
207
+ + commit-graph: fix memory leak when `fill_oids_from_packs()` fails
208
+
209
+ Leakfix.
210
+ source: <pull.1957.v3.git.git.1746779435536.gitgitgadget@gmail.com>
211
+
212
+
213
+* ly/mailinfo-decode-header-leakfix (2025-05-15) 1 commit
214
+ (merged to 'next' on 2025-05-19 at 87066488fc)
215
+ + mailinfo: fix pointential memory leak if `decode_header` failed
216
217
Leakfix.
108
- source: <pull.1962.git.git.1747052530271.gitgitgadget@gmail.com>
218
+ source: <pull.1956.v4.git.git.1747104551204.gitgitgadget@gmail.com>
219
+
220
+
221
+* ly/sequencer-rearrange-leakfix (2025-05-15) 1 commit
222
+ (merged to 'next' on 2025-05-19 at f0ad6cfe21)
223
+ + sequencer: fix memory leak if `todo_list_rearrange_squash()` failed
224
225
+ Leakfix.
226
+ source: <pull.1965.git.git.1747230808770.gitgitgadget@gmail.com>
227
+
228
+
229
+* md/userdiff-bash-shell-function (2025-05-16) 1 commit
230
+ (merged to 'next' on 2025-05-16 at 1fe8b68a72)
231
+ + userdiff: extend Bash pattern to cover more shell function forms
232
111
-* ps/ci-gitlab-enable-msvc-meson-job (2025-05-13) 1 commit
112
- (merged to 'next' on 2025-05-16 at 81da2fbef9)
113
- + gitlab-ci: always run MSVC-based Meson job
233
+ The userdiff pattern for shell scripts has been updated to cope
234
+ with more bash-isms.
235
+ cf. <a72235c1-625a-4b90-8111-629b5a6ee7c2@kdbg.org>
236
+ source: <20250516144515.49514-2-dhar61595@gmail.com>
237
115
- CI settings at GitLab has been updated to run MSVC based Meson job
116
- automatically (as opposed to be done only upon manual request).
117
- source: <20250428-pks-gitlab-ci-execute-win-meson-v1-1-f68683552b9e@pks.im>
238
+
239
+* rj/build-tweaks-part2 (2025-05-19) 5 commits
240
+ (merged to 'next' on 2025-05-19 at fea40b8fb1)
241
+ + configure.ac: upgrade to a compilation check for sysinfo
242
+ + meson.build: correct setting of GIT_EXEC_PATH
243
+ + meson: correct path to system config/attribute files
244
+ + meson: correct install location of YAML.pm
245
+ + meson.build: quote the GITWEBDIR build configuration
246
+
247
+ Updates to meson-based build procedure.
248
+ source: <20250519162523.1001478-1-ramsay@ramsayjones.plus.com>
249
+
250
+
251
+* sj/use-mmap-to-check-packed-refs (2025-05-14) 3 commits
252
+ (merged to 'next' on 2025-05-21 at a0ed4fdf95)
253
+ + packed-backend: mmap large "packed-refs" file during fsck
254
+ + packed-backend: extract snapshot allocation in `load_contents`
255
+ + packed-backend: fsck should warn when "packed-refs" file is empty
256
+
257
+ The code path to access the "packed-refs" file while "fsck" is
258
+ taught to mmap the file, instead of reading the whole file in the
259
+ memory.
260
+ source: <aCS7O8tNekg_u9Wp@ArchLinux>
261
262
--------------------------------------------------
120
-[New Topics]
263
+[Cooking]
264
122
-* op/cvsserver-perl-warning (2025-05-22) 1 commit
123
- - cvsserver: avoid precedence problem between ! and %s
265
+* op/cvsserver-perl-warning (2025-05-27) 1 commit
266
+ - cvsserver: remove unused escapeRefName function
267
268
Recent versions of Perl started warning against "! A =~ /pattern/"
126
- which does not negate the result of the matching.
127
- source: <pull.1925.v3.git.1747913206622.gitgitgadget@gmail.com>
269
+ which does not negate the result of the matching. As it turns out
270
+ that the problematic function is not even called, it was removed.
271
272
+ Will merge to 'nexr'.
273
+ source: <pull.1925.v4.git.1748267305871.gitgitgadget@gmail.com>
274
130
-* ps/meson-tap-parse (2025-05-21) 4 commits
275
+
276
+* ps/meson-tap-parse (2025-05-27) 6 commits
277
- meson: parse TAP output generated by our tests
278
- meson: introduce kwargs variable for tests
279
+ - t7815: fix unexpectedly passing test on macOS
280
+ - t/test-lib: fix TAP format for BASH_XTRACEFD warning
281
- t/test-lib: don't print shell traces to stdout
282
- t: fix cases where output breaks TAP format
283
284
Meson-based build/test framework now understands TAP output
285
generated by our tests.
286
139
- Expecting a reroll.
140
- cf. <aDCNqRAoGygwnAbq@pks.im>
141
- source: <20250506-pks-meson-tap-v1-0-5aaab2942a4c@pks.im>
287
+ Will merge to 'nexr'?
288
+ source: <20250527-pks-meson-tap-v2-0-ae360f77786e@pks.im>
289
290
291
* am/sparse-index-name-hash-fix (2025-05-21) 1 commit
145
- - name-hash: don't add sparse directories in threaded lazy init
292
+ (merged to 'next' on 2025-05-27 at 63076a2233)
293
+ + name-hash: don't add sparse directories in threaded lazy init
294
295
Avoid adding directory path to a sparse-index tree entries to the
296
name-hash, since they would bloat the hashtable without anybody
@@ -150,7 +298,7 @@ Release tarballs are available at:
298
part of the code, but now the multi-threaded code also does the
299
same.
300
153
- Will merge to 'next'.
301
+ Will merge to 'master'.
302
source: <pull.1970.v3.git.git.1747862971672.gitgitgadget@gmail.com>
303
304
@@ -179,7 +327,7 @@ Release tarballs are available at:
327
source: <20250521232917.2333291-1-jacob.e.keller@intel.com>
328
329
182
-* mm/apply-reverse-mode-of-deleted-path (2025-05-23) 2 commits
330
+* mm/apply-reverse-mode-of-deleted-path (2025-05-27) 2 commits
331
- apply: set file mode when --reverse creates a deleted file
332
- t4129: test that git apply warns for unexpected mode changes
333
@@ -187,11 +335,9 @@ Release tarballs are available at:
335
reverse failed to give the mode bits of the path "removed" by the
336
patch to the file it creates, which has been corrected.
337
190
- Will merge to 'next'?
191
- source: <20250523172154.93810-1-mark@chromium.org>
338
+ Will merge to 'next'.
339
+ source: <20250524034046.2619-1-mark@chromium.org>
340
193
---------------------------------------------------
194
-[Cooking]
341
342
* ag/doc-send-email-update-2 (2025-05-19) 4 commits
343
- docs: remove credential helper links for emails from gitcredentials
@@ -206,16 +352,6 @@ Release tarballs are available at:
352
source: <A84F634C-3423-48E2-B648-068A75423037@live.com>
353
354
209
-* es/meson-configure-build-options-fix (2025-05-19) 1 commit
210
- (merged to 'next' on 2025-05-21 at b468031e13)
211
- + meson: reformat default options to workaround bug in `meson configure`
212
-
213
- Build procedure updates.
214
-
215
- Will merge to 'master'.
216
- source: <20250519170945.57746-1-eschwartz@gentoo.org>
217
-
218
-
355
* jt/receive-pack-skip-connectivity-check (2025-05-20) 2 commits
356
(merged to 'next' on 2025-05-22 at 3ced8c5d65)
357
+ builtin/receive-pack: add option to skip connectivity check
@@ -229,7 +365,7 @@ Release tarballs are available at:
365
source: <20250520163218.263921-1-jltobler@gmail.com>
366
367
232
-* kh/notes-doc-fixes (2025-05-23) 9 commits
368
+* kh/notes-doc-fixes (2025-05-27) 9 commits
369
- doc: notes: use stuck form throughout
370
- doc: notes: treat --stdin equally between copy/remove
371
- doc: notes: point out copy --stdin use with argv
@@ -242,9 +378,8 @@ Release tarballs are available at:
378
379
"git notes --help" documentation updates.
380
245
- Comments?
246
- Getting much better.
247
- source: <cover.1748028010.git.code@khaugsbakk.name>
381
+ Will merge to 'next'.
382
+ source: <cover.1748380390.git.code@khaugsbakk.name>
383
384
385
* kn/passing-leak-tests (2025-05-20) 1 commit
@@ -262,6 +397,7 @@ Release tarballs are available at:
397
* ps/midx-negative-packfile-cache (2025-05-20) 2 commits
398
- midx: stop repeatedly looking up nonexistent packfiles
399
- packfile: explain ordering of how we look up auxiliary pack files
400
+ (this branch is used by tb/prepare-midx-pack-cleanup.)
401
402
When a stale .midx file refers to .pack files that no longer exist,
403
we ended up checking for these non-existent files repeatedly, which
@@ -272,14 +408,15 @@ Release tarballs are available at:
408
409
410
* pw/midx-repack-overflow-fix (2025-05-22) 4 commits
275
- - midx docs: clarify tie breaking
276
- - midx: avoid negative array index
277
- - midx repack: avoid potential integer overflow on 64 bit systems
278
- - midx repack: avoid integer overflow on 32 bit systems
411
+ (merged to 'next' on 2025-05-27 at 52646da108)
412
+ + midx docs: clarify tie breaking
413
+ + midx: avoid negative array index
414
+ + midx repack: avoid potential integer overflow on 64 bit systems
415
+ + midx repack: avoid integer overflow on 32 bit systems
416
417
Integer overflow fix around code paths for "git multi-pack-index repack"..
418
282
- Will merge to 'next'.
419
+ Will merge to 'master'.
420
cf. <aC/C9oQrcx/RiyP1@nand.local>
421
source: <cover.1747929225.git.phillip.wood@dunelm.org.uk>
422
@@ -330,103 +467,8 @@ Release tarballs are available at:
467
source: <pull.1890.git.1747313139.gitgitgadget@gmail.com>
468
469
333
-* js/misc-fixes (2025-05-15) 11 commits
334
- (merged to 'next' on 2025-05-21 at e803806107)
335
- + sequencer: stop pretending that an assignment is a condition
336
- + bundle-uri: avoid using undefined output of `sscanf()`
337
- + commit-graph: avoid using stale stack addresses
338
- + trace2: avoid "futile conditional"
339
- + Avoid redundant conditions
340
- + fetch: avoid unnecessary work when there is no current branch
341
- + has_dir_name(): make code more obvious
342
- + upload-pack: rename `enum` to reflect the operation
343
- + commit-graph: avoid malloc'ing a local variable
344
- + fetch: carefully clear local variable's address after use
345
- + commit: simplify code
346
-
347
- Assorted fixes for issues found with CodeQL.
348
-
349
- Will merge to 'master'.
350
- source: <pull.1891.git.1747314709.gitgitgadget@gmail.com>
351
-
352
-
353
-* ly/commit-graph-fill-oids-leakfix (2025-05-15) 1 commit
354
- (merged to 'next' on 2025-05-19 at 972bbc7c11)
355
- + commit-graph: fix memory leak when `fill_oids_from_packs()` fails
356
-
357
- Leakfix.
358
-
359
- Will merge to 'master'.
360
- source: <pull.1957.v3.git.git.1746779435536.gitgitgadget@gmail.com>
361
-
362
-
363
-* ly/mailinfo-decode-header-leakfix (2025-05-15) 1 commit
364
- (merged to 'next' on 2025-05-19 at 87066488fc)
365
- + mailinfo: fix pointential memory leak if `decode_header` failed
366
-
367
- Leakfix.
368
-
369
- Will merge to 'master'.
370
- source: <pull.1956.v4.git.git.1747104551204.gitgitgadget@gmail.com>
371
-
372
-
373
-* ly/sequencer-rearrange-leakfix (2025-05-15) 1 commit
374
- (merged to 'next' on 2025-05-19 at f0ad6cfe21)
375
- + sequencer: fix memory leak if `todo_list_rearrange_squash()` failed
376
-
377
- Leakfix.
378
-
379
- Will merge to 'master'.
380
- source: <pull.1965.git.git.1747230808770.gitgitgadget@gmail.com>
381
-
382
-
383
-* en/sequencer-comment-messages (2025-05-16) 1 commit
384
- (merged to 'next' on 2025-05-21 at b6516794fb)
385
- + sequencer: make it clearer that commit descriptions are just comments
386
-
387
- Prefix '#' to the commit title in the "rebase -i" todo file, just
388
- like a merge commit being replayed.
389
-
390
- Will merge to 'master'.
391
- source: <pull.1923.v2.git.1747412786573.gitgitgadget@gmail.com>
392
-
393
-
394
-* jk/no-funny-object-types (2025-05-16) 13 commits
395
- (merged to 'next' on 2025-05-19 at 4c995dbd23)
396
- + object-file: drop support for writing objects with unknown types
397
- + hash-object: handle --literally with OPT_NEGBIT
398
- + hash-object: merge HASH_* and INDEX_* flags
399
- + hash-object: stop allowing unknown types
400
- + t: add lib-loose.sh
401
- + t/helper: add zlib test-tool
402
- + oid_object_info(): drop type_name strbuf
403
- + fsck: stop using object_info->type_name strbuf
404
- + oid_object_info_convert(): stop using string for object type
405
- + cat-file: use type enum instead of buffer for -t option
406
- + object-file: drop OBJECT_INFO_ALLOW_UNKNOWN_TYPE flag
407
- + cat-file: make --allow-unknown-type a noop
408
- + object-file.h: fix typo in variable declaration
409
-
410
- Support to create a loose object file with unknown object type has
411
- been dropped.
412
-
413
- Will merge to 'master'.
414
- source: <20250516044916.GA21985@coredump.intra.peff.net>
415
-
416
-
417
-* kj/my-first-contribution-updates (2025-05-19) 3 commits
418
- (merged to 'next' on 2025-05-21 at f8c92423fb)
419
- + docs: replace git_config to repo_config
420
- + docs: clarify cmd_psuh signature and explain UNUSED macro
421
- + docs: remove unused mentoring mailing list reference
422
-
423
- Doc updates.
424
-
425
- Will merge to 'master'.
426
- source: <20250518074317.73367-1-jayatheerthkulkarni2005@gmail.com>
427
-
428
-
429
-* kj/renamed-submodule (2025-05-16) 1 commit
470
+* kj/renamed-submodule (2025-05-27) 2 commits
471
+ - submodule: skip redundant active entries when pattern covers path
472
- submodule: prevent overwriting .gitmodules entry on path reuse
473
474
The case where a new submodule takes a path where used to be a
@@ -434,7 +476,7 @@ Release tarballs are available at:
476
before.
477
478
Comments?
437
- source: <20250516174934.45008-1-jayatheerthkulkarni2005@gmail.com>
479
+ source: <20250524073628.58944-1-jayatheerthkulkarni2005@gmail.com>
480
481
482
* pw/update-thunderbird-patch-inline (2025-05-16) 1 commit
@@ -457,37 +499,11 @@ Release tarballs are available at:
499
An interchange format for stash entries is defined, and subcommand
500
of "git stash" to import/export has been added.
501
460
- Will merge to 'next'?
502
+ Expecting a v7.
503
+ cf. <aDTJHGmCnvdFkswt@tapette.crustytoothpaste.net>
504
source: <20250522185524.18398-1-sandals@crustytoothpaste.net>
505
506
464
-* ds/sparse-apply-add-p (2025-05-16) 4 commits
465
- (merged to 'next' on 2025-05-21 at 933f316786)
466
- + p2000: add performance test for patch-mode commands
467
- + reset: integrate sparse index with --patch
468
- + git add: make -p/-i aware of sparse index
469
- + apply: integrate with the sparse index
470
-
471
- "git apply" and "git add -i/-p" code paths no longer unnecessarily
472
- expand sparse-index while working.
473
-
474
- Will merge to 'master'.
475
- Kicked out of next and then is about to come back.
476
- source: <pull.1914.v2.git.1747407330.gitgitgadget@gmail.com>
477
-
478
-
479
-* en/merge-tree-check (2025-05-16) 2 commits
480
- (merged to 'next' on 2025-05-19 at c3278b91fa)
481
- + merge-tree: add a new --quiet flag
482
- + merge-ort: add a new mergeability_only option
483
-
484
- "git merge-tree" learned an option to see if it resolves cleanly
485
- without actually creating a result.
486
-
487
- Will merge to 'master'.
488
- source: <pull.1920.v4.git.1747425858.gitgitgadget@gmail.com>
489
-
490
-
507
* lm/add-p-context (2025-05-12) 4 commits
508
- add-patch: add diff.context command line overrides
509
- add-patch: respect diff.context configuration
@@ -521,20 +537,6 @@ Release tarballs are available at:
537
source: <20250512-pks-contrib-spring-cleanup-v3-0-32e151b0bfb0@pks.im>
538
539
524
-* rj/build-tweaks-part2 (2025-05-19) 5 commits
525
- (merged to 'next' on 2025-05-19 at fea40b8fb1)
526
- + configure.ac: upgrade to a compilation check for sysinfo
527
- + meson.build: correct setting of GIT_EXEC_PATH
528
- + meson: correct path to system config/attribute files
529
- + meson: correct install location of YAML.pm
530
- + meson.build: quote the GITWEBDIR build configuration
531
-
532
- Updates to meson-based build procedure.
533
-
534
- Will merge to 'master'.
535
- source: <20250519162523.1001478-1-ramsay@ramsayjones.plus.com>
536
-
537
-
540
* ps/object-store (2025-05-14) 18 commits
541
- odb: rename `read_object_with_reference()`
542
- odb: rename `pretend_object_file()`
@@ -561,20 +563,6 @@ Release tarballs are available at:
563
source: <20250514-pks-object-store-wo-the-repository-v3-0-47df1d4ead22@pks.im>
564
565
564
-* sj/use-mmap-to-check-packed-refs (2025-05-14) 3 commits
565
- (merged to 'next' on 2025-05-21 at a0ed4fdf95)
566
- + packed-backend: mmap large "packed-refs" file during fsck
567
- + packed-backend: extract snapshot allocation in `load_contents`
568
- + packed-backend: fsck should warn when "packed-refs" file is empty
569
-
570
- The code path to access the "packed-refs" file while "fsck" is
571
- taught to mmap the file, instead of reading the whole file in the
572
- memory.
573
-
574
- Will merge to 'master'.
575
- source: <aCS7O8tNekg_u9Wp@ArchLinux>
576
-
577
-
566
* cc/promisor-remote-capability (2025-05-19) 5 commits
567
- promisor-remote: use string constants for 'name' and 'url' too
568
- promisor-remote: allow a client to check fields
@@ -586,19 +574,6 @@ Release tarballs are available at:
574
source: <20250519141259.3061550-1-christian.couder@gmail.com>
575
576
589
-* jc/doc-synopsis-option-markup (2025-05-12) 4 commits
590
- (merged to 'next' on 2025-05-21 at cb897d1302)
591
- + git-var doc: fix usage of $ENV_VAR vs ENV_VAR
592
- + git-verify-* doc: update mark-up of synopsis option descriptions
593
- + git-{var,write-tree} docs: update mark-up of synopsis option descriptions
594
- + git-daemon doc: update mark-up of synopsis option descriptions
595
-
596
- Doc mark-up fixes.
597
-
598
- Will merge to 'master'.
599
- source: <20250510123346.20927-1-jn.avila@free.fr>
600
-
601
-
577
* jc/you-still-use-whatchanged (2025-05-12) 6 commits
578
(merged to 'next' on 2025-05-22 at e79dc9090e)
579
+ whatschanged: list it in BreakingChanges document
@@ -689,18 +664,6 @@ Release tarballs are available at:
664
source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>
665
666
692
-* md/userdiff-bash-shell-function (2025-05-16) 1 commit
693
- (merged to 'next' on 2025-05-16 at 1fe8b68a72)
694
- + userdiff: extend Bash pattern to cover more shell function forms
695
-
696
- The userdiff pattern for shell scripts has been updated to cope
697
- with more bash-isms.
698
-
699
- Will merge to 'master'.
700
- cf. <a72235c1-625a-4b90-8111-629b5a6ee7c2@kdbg.org>
701
- source: <20250516144515.49514-2-dhar61595@gmail.com>
702
-
703
-
667
* ds/path-walk-2 (2025-05-16) 13 commits
668
- pack-objects: allow --shallow and --path-walk
669
- path-walk: add new 'edge_aggressive' option