What's cooking (2024/09 #03)
Junio C Hamano committed
Sep 9, 2024 at 12:33 UTC
7360a0d4619e65f0a97e320889f6c814fdf10898
1 file changed
+66
-64
whats-cooking.txt
+66
-64
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2024, #02; Sun, 8)
2
+Subject: What's cooking in git.git (Sep 2024, #03; Mon, 9)
3
X-master-at: 4c42d5ff284067fa32837421408bebfef996bf81
4
-X-next-at: a52a31f161238e49828c2297ec5c26a7f3b8c689
4
+X-next-at: a09f0889bb33dc86ffe53d14730c994b00d10e9e
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2024, #02; Sun, 8)
7
+What's cooking in git.git (Sep 2024, #03; Mon, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,64 +46,63 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
49
-[Graduated to 'master']
49
+[New Topics]
50
51
-* jc/maybe-unused (2024-08-29) 2 commits
52
- (merged to 'next' on 2024-08-30 at e5961a9dc9)
53
- + CodingGuidelines: also mention MAYBE_UNUSED
54
- + Merge branch 'jk/unused-parameters' into jc/maybe-unused
55
- (this branch uses jk/unused-parameters.)
51
+* rj/cygwin-has-dev-tty (2024-09-08) 1 commit
52
+ (merged to 'next' on 2024-09-09 at 5c5726050f)
53
+ + config.mak.uname: add HAVE_DEV_TTY to cygwin config section
54
57
- Developer doc updates.
58
- source: <xmqq4j73w5up.fsf_-_@gitster.g>
55
+ Cygwin does have /dev/tty support that is needed by things like
56
+ single-key input mode.
57
58
+ Will merge to 'master'.
59
+ source: <e3339b4d-dab1-4247-b70e-d3224bab1b6b@ramsayjones.plus.com>
60
61
-* jc/unused-on-windows (2024-08-30) 1 commit
62
- (merged to 'next' on 2024-08-30 at a2a2aa6e59)
63
- + refs/files-backend: work around -Wunused-parameter
61
65
- Fix more fallouts from -Werror=unused-parameter.
66
- source: <xmqqjzfxrekm.fsf@gitster.g>
62
+* ah/apply-3way-ours (2024-09-09) 1 commit
63
+ - apply: support --ours, --theirs, and --union for three-way merges
64
65
+ "git apply --3way" learned to take "--ours" and other options.
66
69
-* jk/maybe-unused-cleanup (2024-08-29) 2 commits
70
- (merged to 'next' on 2024-08-30 at 0ff6ea5748)
71
- + grep: prefer UNUSED to MAYBE_UNUSED for pcre allocators
72
- + gc: drop MAYBE_UNUSED annotation from used parameter
67
+ Will merge to 'next'.
68
+ source: <20240909141109.3102-2-alexhenrie24@gmail.com>
69
74
- Code clean-up.
75
- source: <20240829200807.GA430283@coredump.intra.peff.net>
70
71
+* ds/pack-name-hash-tweak (2024-09-09) 4 commits
72
+ - p5313: add size comparison test
73
+ - p5314: add a size test for name-hash collisions
74
+ - git-repack: update usage to match docs
75
+ - pack-objects: add --full-name-hash option
76
+
77
+ In a repository with too many (more than --window size) similarly
78
+ named files, "git repack" would not find good delta-base candidate
79
+ and worse, it may not use a blob from exactly the same path as a
80
+ good delta-base candidate. Optionally replace the name hash so
81
+ that only blobs at the same path and nothing else are used as
82
+ delta-base candidate.
83
78
-* jk/send-email-mailmap (2024-08-27) 3 commits
79
- (merged to 'next' on 2024-08-30 at a5cf30460a)
80
- + send-email: add mailmap support via sendemail.mailmap and --mailmap
81
- + check-mailmap: add options for additional mailmap sources
82
- + check-mailmap: accept "user@host" contacts
84
+ Needs review.
85
+ source: <pull.1785.git.1725890210.gitgitgadget@gmail.com>
86
84
- "git send-email" learned "--mailmap" option to allow rewriting the
85
- recipient addresses.
86
- source: <20240827-jk-send-email-mailmap-support-v3-0-bec5ba9be391@gmail.com>
87
88
+* ps/reftable-exclude (2024-09-09) 7 commits
89
+ - refs/reftable: wire up support for exclude patterns
90
+ - reftable/reader: make table iterator reseekable
91
+ - t/unit-tests: introduce reftable library
92
+ - Makefile: stop listing test library objects twice
93
+ - builtin/receive-pack: fix exclude patterns when announcing refs
94
+ - refs: properly apply exclude patterns to namespaced refs
95
+ - Merge branch 'cp/unit-test-reftable-stack' into ps/reftable-exclude
96
+ (this branch uses cp/unit-test-reftable-stack.)
97
89
-* jk/unused-parameters (2024-08-28) 7 commits
90
- (merged to 'next' on 2024-08-30 at 2c5169ff52)
91
- + CodingGuidelines: mention -Wunused-parameter and UNUSED
92
- + config.mak.dev: enable -Wunused-parameter by default
93
- + compat: mark unused parameters in win32/mingw functions
94
- + compat: disable -Wunused-parameter in win32/headless.c
95
- + compat: disable -Wunused-parameter in 3rd-party code
96
- + t-reftable-readwrite: mark unused parameter in callback function
97
- + gc: mark unused config parameter in virtual functions
98
- (this branch is used by jc/maybe-unused.)
98
+ The reftable backend learned to more efficiently handle exclude
99
+ patterns while enumerating the refs.
100
100
- Make our codebase compilable with the -Werror=unused-parameter
101
- option.
102
- source: <20240828035722.GA3998881@coredump.intra.peff.net>
103
- source: <CAPig+cQLr+vAzkt8UJNVCeE8osGEcEfFunG36oqxa0k8JamJzQ@mail.gmail.com>
101
+ Needs review.
102
+ source: <cover.1725881266.git.ps@pks.im>
103
104
--------------------------------------------------
106
-[New Topics]
105
+[Cooking]
106
107
* ds/doc-wholesale-disabling-advice-messages (2024-09-06) 1 commit
108
(merged to 'next' on 2024-09-07 at a52a31f161)
@@ -131,12 +130,13 @@ Release tarballs are available at:
130
131
132
* bl/trailers-and-incomplete-last-line-fix (2024-09-06) 1 commit
134
- - interpret-trailers: handle message without trailing newline
133
+ (merged to 'next' on 2024-09-09 at a09f0889bb)
134
+ + interpret-trailers: handle message without trailing newline
135
136
The interpret-trailers command failed to recognise the end of the
137
message when the commit log ends in an incomplete line.
138
139
- Will merge to 'next'?
139
+ Will merge to 'master'.
140
source: <20240906145743.2059405-1-brianmlyles@gmail.com>
141
142
@@ -150,28 +150,28 @@ Release tarballs are available at:
150
source: <20240906153003.110200-2-ischis2@cox.net>
151
152
153
-* jc/doc-skip-fetch-all-and-prefetch (2024-09-07) 1 commit
154
- - doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch
153
+* jc/doc-skip-fetch-all-and-prefetch (2024-09-09) 1 commit
154
+ (merged to 'next' on 2024-09-09 at a2bf302636)
155
+ + doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch
156
157
Doc updates.
158
158
- Will merge to 'next'.
159
- source: <xmqq8qw3xvob.fsf_-_@gitster.g>
159
+ Will merge to 'master'.
160
+ source: <xmqqseu8u8m0.fsf@gitster.g>
161
162
163
* rs/diff-exit-code-fix (2024-09-08) 2 commits
163
- - diff: report dirty submodules as changes in builtin_diff()
164
- - diff: report copies and renames as changes in run_diff_cmd()
164
+ (merged to 'next' on 2024-09-09 at f52bb4afb2)
165
+ + diff: report dirty submodules as changes in builtin_diff()
166
+ + diff: report copies and renames as changes in run_diff_cmd()
167
168
In a few corner cases "git diff --exit-code" failed to report
169
"changes" (e.g., renamed without any content change), which has
170
been corrected.
171
170
- Will merge to 'next'.
172
+ Will merge to 'master'.
173
source: <0864c86a-5562-4780-92c5-59d6c1a35aad@web.de>
174
173
---------------------------------------------------
174
-[Cooking]
175
176
* jk/free-commit-buffer-of-skipped-commits (2024-08-30) 1 commit
177
(merged to 'next' on 2024-09-03 at a8fb72a4d5)
@@ -226,17 +226,19 @@ Release tarballs are available at:
226
source: <pull.1772.v2.git.1725289979450.gitgitgadget@gmail.com>
227
228
229
-* cp/unit-test-reftable-stack (2024-09-08) 6 commits
230
- - t-reftable-stack: add test for stack iterators
231
- - t-reftable-stack: add test for non-default compaction factor
232
- - t-reftable-stack: use reftable_ref_record_equal() to compare ref records
233
- - t-reftable-stack: use Git's tempfile API instead of mkstemp()
234
- - t: harmonize t-reftable-stack.c with coding guidelines
235
- - t: move reftable/stack_test.c to the unit testing framework
229
+* cp/unit-test-reftable-stack (2024-09-09) 6 commits
230
+ (merged to 'next' on 2024-09-09 at 0dddbbb60d)
231
+ + t-reftable-stack: add test for stack iterators
232
+ + t-reftable-stack: add test for non-default compaction factor
233
+ + t-reftable-stack: use reftable_ref_record_equal() to compare ref records
234
+ + t-reftable-stack: use Git's tempfile API instead of mkstemp()
235
+ + t: harmonize t-reftable-stack.c with coding guidelines
236
+ + t: move reftable/stack_test.c to the unit testing framework
237
+ (this branch is used by ps/reftable-exclude.)
238
239
Another reftable test migrated to the unit-test framework.
240
239
- Will merge to 'next'.
241
+ Will merge to 'master'.
242
source: <20240908041632.4948-1-chandrapratap3519@gmail.com>
243
244