What's cooking (2025/06 #03)
Junio C Hamano committed
Jun 9, 2025 at 09:36 UTC
c13a8be5f670b8e8c4f9eb634b8f316eefb48347
1 file changed
+117
-112
whats-cooking.txt
+117
-112
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2025, #02; Sat, 7)
3
-X-master-at: 8db3019401f8093fb895f581be641fe7e05aa755
4
-X-next-at: 56857d51d7a015fa5707ce6b86b5deb70eecb676
2
+Subject: What's cooking in git.git (Jun 2025, #03; Mon, 9)
3
+X-master-at: 4c0e625c091d4c648cec7319bafaed3cc81658e5
4
+X-next-at: 299adb869395ee10d8b4c20bedb588a59fa98455
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jun 2025, #02; Sat, 7)
7
+What's cooking in git.git (Jun 2025, #03; Mon, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,44 +48,56 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* bs/bsd-wo-specific-xopen-source (2025-06-02) 1 commit
52
- (merged to 'next' on 2025-06-05 at ce6964f985)
53
- + compat: fixes for header handling with OpenBSD / NetBSD
51
+* mm/test-in-absolute-home (2025-05-28) 1 commit
52
+ (merged to 'next' on 2025-06-05 at ae6cc48f8d)
53
+ + t: run tests from a normalized working directory
54
55
- Build fix for BSDs.
56
- source: <aD1SvlRypkhczxRS@humpty.home.comstyle.com>
55
+ Tests that compare $HOME and $(pwd), which should be the same
56
+ directory unless the tests chdir's around, would fail when the user
57
+ enters the test directory via symbolic links, which has been
58
+ corrected.
59
+ source: <20250528201737.55268-1-mark@chromium.org>
60
61
+--------------------------------------------------
62
+[New Topics]
63
59
-* cf/var-completion-obsd-fixes (2025-06-02) 1 commit
60
- (merged to 'next' on 2025-06-05 at 0e07c5bcf4)
61
- + completion: make sed command that generates config-list.h portable.
64
+* ja/doc-git-log-markup (2025-06-08) 9 commits
65
+ - doc: git-log: convert log config to new doc format
66
+ - doc: git-log: convert diff options to new doc format
67
+ - doc: git-log: convert pretty formats to new doc format
68
+ - doc: git-log: convert pretty options to new doc format
69
+ - doc: git-log: convert rev list options to new doc format
70
+ - doc: git-log: convert line range format to new doc format
71
+ - doc: git-log: convert line range options to new doc format
72
+ - doc: git-log convert rev-list-description to new doc format
73
+ - doc: convert git-log to new documentation format
74
63
- Build fix for OpenBSD.
64
- source: <59b2a12a3f43cf078fbeaf0271b5a7cfffc9eb8f.1748903426.git.collin.funk1@gmail.com>
75
+ Doc mark-up updates.
76
+ source: <pull.1933.git.1749373787.gitgitgadget@gmail.com>
77
78
67
-* jk/curl-easy-setopt-typefix (2025-06-04) 3 commits
68
- (merged to 'next' on 2025-06-06 at b1769b9fb4)
69
- + curl: fix symbolic constant typechecks with curl_easy_setopt()
70
- + curl: fix integer variable typechecks with curl_easy_setopt()
71
- + curl: fix integer constant typechecks with curl_easy_setopt()
72
- (this branch is used by js/curl-easy-setopt-typefix.)
79
+* kj/stash-onbranch-submodule-fix (2025-06-08) 1 commit
80
+ (merged to 'next' on 2025-06-09 at a5dae097d7)
81
+ + stash: fix incorrect branch name in stash message
82
74
- Adjust to newer version of libcURL.
75
- source: <20250604205505.GA1510724@coredump.intra.peff.net>
83
+ "git stash" recorded a wrong branch name when submodules are
84
+ present in the current checkout, which has been corrected.
85
86
+ Will cook in 'next'.
87
+ source: <20250608144542.275836-1-jayatheerthkulkarni2005@gmail.com>
88
78
-* js/curl-easy-setopt-typefix (2025-06-06) 2 commits
79
- (merged to 'next' on 2025-06-06 at f25aaba642)
80
- + curl: pass `long` values where expected
81
- + Merge branch 'jk/curl-easy-setopt-typefix' into js/curl-easy-setopt-typefix
82
- (this branch uses jk/curl-easy-setopt-typefix.)
89
84
- Adjust to newer version of libcURL.
85
- source: <80de7491d24fb51c6b2c3b2fc1728db30e2477f7.1749202164.git.gitgitgadget@gmail.com>
90
+* ly/submodule-update-failure-leakfix (2025-06-07) 1 commit
91
+ (merged to 'next' on 2025-06-09 at b28794c576)
92
+ + builtin/submodule--helper: fix leak when remote_submodule_branch() failed
93
+
94
+ A memory leak on an error code path has been plugged.
95
+
96
+ Will cook in 'next'.
97
+ source: <pull.1987.git.git.1749355019495.gitgitgadget@gmail.com>
98
99
--------------------------------------------------
88
-[New Topics]
100
+[Cooking]
101
102
* kn/fetch-push-bulk-ref-update-fixup (2025-06-06) 3 commits
103
- receive-pack: handle reference deletions separately
@@ -94,67 +106,56 @@ Release tarballs are available at:
106
(this branch uses kn/fetch-push-bulk-ref-update.)
107
108
Additional fixes to the base topic.
109
+
110
+ Comments?
111
source: <20250606-6769-address-test-failures-in-the-next-branch-caused-by-batched-reference-updates-v3-0-e1c41693bd35@gmail.com>
112
113
114
* ma/doc-diff-cc-headers (2025-06-06) 1 commit
101
- - diff-generate-patch.adoc: drop spurious backticks
115
+ (merged to 'next' on 2025-06-08 at e2072501f7)
116
+ + diff-generate-patch.adoc: drop spurious backticks
117
118
Doc mark-up update.
119
105
- Will merge to 'next'.
120
+ Will cook in 'next'.
121
source: <20250606123138.566178-1-martin.agren@gmail.com>
122
123
124
* ss/bswap-ntohll-fix (2025-06-06) 1 commit
110
- - bswap.h: Move the overwriting of the ntohl*/ htonl* macros.
125
+ . bswap.h: Move the overwriting of the ntohl*/ htonl* macros.
126
127
+ Seems to break Windows rather badly.
128
+ cf. https://github.com/git/git/actions/runs/15511228119/job/43672455770#step:4:92
129
source: <20250606165718.HOiC2U4X@breakpoint.cc>
130
131
115
-* jc/merge-compact-summary (2025-06-06) 1 commit
116
- - merge/pull: --compact-summary
117
-
118
-
119
-* bs/solaris-10-and-11 (2025-06-06) 1 commit
120
- - config.mak.uname: update settings for Solaris 11
132
+* bs/solaris-10-and-11 (2025-06-07) 1 commit
133
+ (merged to 'next' on 2025-06-09 at a6d20b3666)
134
+ + config.mak.uname: update settings for Solaris 10 and 11
135
122
- source: <aEOlc_PV7ZngUdj0@humpty.home.comstyle.com>
123
-
124
---------------------------------------------------
125
-[Cooking]
126
-
127
-* mm/test-in-absolute-home (2025-05-28) 1 commit
128
- (merged to 'next' on 2025-06-05 at ae6cc48f8d)
129
- + t: run tests from a normalized working directory
130
-
131
- Tests that compare $HOME and $(pwd), which should be the same
132
- directory unless the tests chdir's around, would fail when the user
133
- enters the test directory via symbolic links, which has been
134
- corrected.
136
+ Add settings for Solaris 10 & 11.
137
138
Will cook in 'next'.
137
- cf. <xmqq4iwwk7mc.fsf@gitster.g>
138
- source: <20250528201737.55268-1-mark@chromium.org>
139
+ source: <aETm3O-FE7EpyoE5@humpty.home.comstyle.com>
140
141
141
-* ag/imap-send-resurrection (2025-06-06) 10 commits
142
- - imap-send: add ability to list the available folders
142
+* ag/imap-send-resurrection (2025-06-09) 10 commits
143
+ - imap-send: fix minor mistakes in the logs
144
- imap-send: display the destination mailbox when sending a message
145
- imap-send: display port alongwith host when git credential is invoked
145
- - imap-send: fix minor mistakes in the logs
146
+ - imap-send: add ability to list the available folders
147
- imap-send: enable specifying the folder using the command line
147
- - imap-send: gracefully fail if CRAM-MD5 authentication is requested without OpenSSL
148
- - imap-send: fix memory leak in case auth_cram_md5 fails
148
- imap-send: add PLAIN authentication method to OpenSSL
149
- imap-send: add support for OAuth2.0 authentication
150
+ - imap-send: gracefully fail if CRAM-MD5 authentication is requested without OpenSSL
151
+ - imap-send: fix memory leak in case auth_cram_md5 fails
152
- imap-send: fix bug causing cfg->folder being set to NULL
153
154
"git imap-send" has been broken for a long time, which has been
155
resurrected and then taught to talk OAuth2.0 etc.
156
156
- Getting there.
157
- source: <PN3PR01MB9597BB453E9980CC50AA6703B86EA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
157
+ Ready?
158
+ source: <PN3PR01MB95976572C3B14C983802ECC1B86BA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
159
160
161
* ag/send-email-docs (2025-05-30) 4 commits
@@ -171,14 +172,14 @@ Release tarballs are available at:
172
source: <20250530154934.10077-1-gargaditya08@live.com>
173
174
174
-* ly/pack-bitmap-root-leakfix (2025-06-05) 1 commit
175
- (merged to 'next' on 2025-06-07 at 57cb6791ac)
175
+* ly/pack-bitmap-root-leakfix (2025-06-09) 1 commit
176
+ (merged to 'next' on 2025-06-09 at 15ff3f5f36)
177
+ pack-bitmap: remove checks before bitmap_free
178
179
Memleak fix on an error code path.
180
181
Will cook in 'next'.
181
- source: <pull.1977.v6.git.git.1749138820241.gitgitgadget@gmail.com>
182
+ source: <pull.1977.v7.git.git.1749457124804.gitgitgadget@gmail.com>
183
184
185
* pw/subtree-gpg-sign (2025-06-04) 2 commits
@@ -269,11 +270,12 @@ Release tarballs are available at:
270
271
272
* jm/bundle-uri-debug-output-to-fp (2025-06-04) 1 commit
272
- - bundle-uri: send debug output to given FILE * stream
273
+ (merged to 'next' on 2025-06-09 at c58618e2dd)
274
+ + bundle-uri: send debug output to given FILE * stream
275
276
Code clean-up.
277
276
- Will merge to 'next'?
278
+ Will cook in 'next'.
279
source: <pull.1985.v2.git.git.1749057081918.gitgitgadget@gmail.com>
280
281
@@ -308,14 +310,15 @@ Release tarballs are available at:
310
311
312
* ag/send-email-edit-threading-fix (2025-06-04) 2 commits
311
- - send-email: show the new message id assigned by outlook in the logs
312
- - send-email: fix bug resulting in broken threads if a message is edited
313
+ (merged to 'next' on 2025-06-09 at e53466b5aa)
314
+ + send-email: show the new message id assigned by outlook in the logs
315
+ + send-email: fix bug resulting in broken threads if a message is edited
316
317
"git send-email" incremented its internal message counter when a
318
message was edited, which made logic that treats the first message
319
specially misbehave, which has been corrected.
320
318
- Will merge to 'next'?
321
+ Will cook in 'next'.
322
source: <PN3PR01MB95979AA8114CA26405BE02CFB86CA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
323
324
@@ -398,13 +401,14 @@ Release tarballs are available at:
401
402
403
* jw/doc-txt-to-adoc-refs (2025-05-21) 1 commit
401
- - doc: update references to renamed AsciiDoc files
404
+ (merged to 'next' on 2025-06-08 at 041162a215)
405
+ + doc: update references to renamed AsciiDoc files
406
407
Some leftover references to documentation source files that no
408
longer exist, due to recent ".txt" -> ".adoc" renaming, have been
409
corrected.
410
407
- Will merge to 'next'.
411
+ Will cook in 'next'.
412
source: <pull.1971.git.git.1747854310479.gitgitgadget@gmail.com>
413
414
@@ -423,12 +427,13 @@ Release tarballs are available at:
427
428
429
* pw/stash-p-pathspec-fixes (2025-06-07) 2 commits
426
- - stash: allow "git stash [<options>] --patch <pathspec>" to assume push
427
- - stash: allow "git stash -p <pathspec>" to assume push again
430
+ (merged to 'next' on 2025-06-08 at 5932e4b43a)
431
+ + stash: allow "git stash [<options>] --patch <pathspec>" to assume push
432
+ + stash: allow "git stash -p <pathspec>" to assume push again
433
434
"git stash -p <pathspec>" improvements.
435
431
- Will merge to 'next'.
436
+ Will cook in 'next'.
437
source: <cover.1749289514.git.phillip.wood@dunelm.org.uk>
438
439
@@ -447,29 +452,7 @@ Release tarballs are available at:
452
source: <20250519-501-update-git-fetch-1-to-use-partial-transactions-v3-0-6cdfd4f769b9@gmail.com>
453
454
450
-* js/misc-defensive (2025-05-15) 14 commits
451
- - shallow: handle missing shallow commits gracefully
452
- - test-tool repository: check return value of `lookup_commit()`
453
- - submodule: check return value of `submodule_from_path()`
454
- - inherit_tracking(): defensive programming
455
- - describe: defensive programming
456
- - fetch: defensive programming
457
- - push: defensive programming
458
- - stash: defensive programming
459
- - stash: defensive programming
460
- - verify_commit_graph(): defensive programming
461
- - unparse_commit(): defensive programming
462
- - fetch-pack: defensive programming
463
- - get_parent(): defensive programming
464
- - revision: defensive programming
465
-
466
- Assorted changes that please CodeQL.
467
-
468
- Will discard, as no strong support seems to be there in the thread.
469
- source: <pull.1890.git.1747313139.gitgitgadget@gmail.com>
470
-
471
-
472
-* kj/renamed-submodule (2025-05-24) 2 commits
455
+* kj/renamed-submodule (2025-06-07) 2 commits
456
- submodule: skip redundant active entries when pattern covers path
457
- submodule: prevent overwriting .gitmodules entry on path reuse
458
@@ -478,17 +461,7 @@ Release tarballs are available at:
461
before.
462
463
Comments?
481
- source: <20250524073628.58944-1-jayatheerthkulkarni2005@gmail.com>
482
-
483
-
484
-* pw/update-thunderbird-patch-inline (2025-05-16) 1 commit
485
- - contrib: update thunderbird-patch-inline
486
-
487
- Update bitrotten instruction for sending patches via Thunderbird
488
- (in contrib/).
489
-
490
- Will discard, as it was let be bitrotten without bothering any users.
491
- source: <20250516135540.218937-1-phillip.wood123@gmail.com>
464
+ source: <20250608032705.11990-1-jayatheerthkulkarni2005@gmail.com>
465
466
467
* bc/stash-export-import (2025-06-01) 4 commits
@@ -668,11 +641,43 @@ Release tarballs are available at:
641
--------------------------------------------------
642
[Discarded]
643
644
+* pw/update-thunderbird-patch-inline (2025-05-16) 1 commit
645
+ . contrib: update thunderbird-patch-inline
646
+
647
+ Update bitrotten instruction for sending patches via Thunderbird
648
+ (in contrib/).
649
+
650
+ Will discard, as it was let be bitrotten without bothering any users.
651
+ source: <20250516135540.218937-1-phillip.wood123@gmail.com>
652
+
653
+
654
+* js/misc-defensive (2025-05-15) 14 commits
655
+ . shallow: handle missing shallow commits gracefully
656
+ . test-tool repository: check return value of `lookup_commit()`
657
+ . submodule: check return value of `submodule_from_path()`
658
+ . inherit_tracking(): defensive programming
659
+ . describe: defensive programming
660
+ . fetch: defensive programming
661
+ . push: defensive programming
662
+ . stash: defensive programming
663
+ . stash: defensive programming
664
+ . verify_commit_graph(): defensive programming
665
+ . unparse_commit(): defensive programming
666
+ . fetch-pack: defensive programming
667
+ . get_parent(): defensive programming
668
+ . revision: defensive programming
669
+
670
+ Assorted changes that please CodeQL.
671
+
672
+ Will discard, as no strong support seems to be there in the thread.
673
+ source: <pull.1890.git.1747313139.gitgitgadget@gmail.com>
674
+
675
+
676
* pb/status-rebase-fixes (2025-03-28) 4 commits
672
- - wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
673
- - wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase
674
- - SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>
675
- - rebase -r: do create merge commit after empty resolution
677
+ . wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
678
+ . wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase
679
+ . SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>
680
+ . rebase -r: do create merge commit after empty resolution
681
682
A few fixes around "git status" while "git rebase" is running,
683
plus a corner case bug fix for "git rebase -r".