What's cooking (2023/04 #02)

Junio C Hamano committed Apr 6, 2023 at 14:04 UTC 1b21701f49696fb6e0bbee8b4fa6f5b37b983ddc
1 file changed +339 -475
whats-cooking.txt
+339 -475
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Apr 2023, #01; Tue, 4)
3 -X-master-at: ae73b2c8f1da39c39335ee76a0f95857712c22a7
4 -X-next-at: 699aa5c54e8a07724f4438867e3ecd26ba51585d
2 +Subject: What's cooking in git.git (Apr 2023, #02; Thu, 6)
3 +X-master-at: 0607f793cbe0af16aee6d2480056d891835884bd
4 +X-next-at: 4ca3ef321147b456561d0c3a4c90cbb38891a488
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Apr 2023, #01; Tue, 4)
7 +What's cooking in git.git (Apr 2023, #02; Thu, 6)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -16,6 +16,11 @@ message that raises issues but they are no means exhaustive. A
16 topic without enough support may be discarded after a long period of
17 no activity.
18
19 +We are in the middle of the 4th week of an 10-week cycle which is
20 +expected to last til the end of May. With quite a many topics that
21 +have been cooking in 'next' already graduated to 'master', it is a
22 +good time to rewind the tip of 'next', which I'll be doing shortly.
23 +
24 Copies of the source code to Git live in many repositories, and the
25 following is a list of the ones I push into or their mirrors. Some
26 repositories have only a subset of branches.
@@ -47,336 +52,284 @@ Release tarballs are available at:
52 --------------------------------------------------
53 [Graduated to 'master']
54
50 -* ab/retire-scripted-add-p (2023-03-27) 1 commit
51 - (merged to 'next' on 2023-03-27 at f8cbc0c604)
52 - + t3701: we don't need no Perl for `add -i` anymore
53 -
54 - Test fix.
55 - source: <pull.1504.git.1679898996492.gitgitgadget@gmail.com>
56 -
57 -
58 -* ah/rebase-merges-config (2023-03-27) 3 commits
59 - (merged to 'next' on 2023-03-27 at c8a894ba4b)
60 - + rebase: add a config option for --rebase-merges
61 - + rebase: deprecate --rebase-merges=""
62 - + rebase: add documentation and test for --no-rebase-merges
63 -
64 - Streamline --rebase-merges command line option handling and
65 - introduce rebase.merges configuration variable.
66 - source: <20230326030636.2635642-1-alexhenrie24@gmail.com>
67 -
68 -
69 -* ar/test-cleanup-unused-file-creation (2023-03-20) 7 commits
70 - (merged to 'next' on 2023-03-28 at ad035b41ea)
71 - + t1507: assert output of rev-parse
72 - + t1404: don't create unused file
73 - + t1400: assert output of update-ref
74 - + t1302: don't create unused file
75 - + t1010: don't create unused files
76 - + t1006: assert error output of cat-file
77 - + t1005: assert output of ls-files
78 -
79 - Test clean-up.
80 - source: <20230312201520.370234-1-rybak.a.v@gmail.com>
81 -
82 -
83 -* bb/unicode-width-table-15 (2023-03-30) 1 commit
84 - (merged to 'next' on 2023-03-31 at b8f3e899ac)
85 - + unicode: update the width tables to Unicode 15
86 -
87 - Update width table for the latest edition of Unicode.
88 - source: <20230330191517.1762375-1-dev+git@drbeat.li>
89 -
90 -
91 -* ds/p2000-fix-grep-sparse (2023-03-28) 1 commit
92 - (merged to 'next' on 2023-03-29 at 6a59283aa3)
93 - + p2000: remove stray '--sparse' flag from test
94 -
95 - Fix perf test.
96 - source: <pull.1505.git.1680034162144.gitgitgadget@gmail.com>
97 -
98 -
99 -* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit
100 - (merged to 'next' on 2023-03-23 at 01b35c0581)
101 - + am: refer to format-patch in the documentation
55 +* ab/config-multi-and-nonbool (2023-03-28) 9 commits
56 + (merged to 'next' on 2023-03-30 at bcfe99b43d)
57 + + for-each-repo: with bad config, don't conflate <path> and <cmd>
58 + + config API: add "string" version of *_value_multi(), fix segfaults
59 + + config API users: test for *_get_value_multi() segfaults
60 + + for-each-repo: error on bad --config
61 + + config API: have *_multi() return an "int" and take a "dest"
62 + + versioncmp.c: refactor config reading next commit
63 + + config API: add and use a "git_config_get()" family of functions
64 + + config tests: add "NULL" tests for *_get_value_multi()
65 + + config tests: cover blind spots in git_die_config() tests
66
103 - Doc update.
104 - source: <xmqq1qlij9qr.fsf@gitster.g>
67 + Assorted config API updates.
68 + source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@gmail.com>
69
70
107 -* jk/blame-contents-with-arbitrary-commit (2023-03-24) 1 commit
108 - (merged to 'next' on 2023-03-27 at 74beb3baf9)
109 - + blame: allow --contents to work with non-HEAD commit
71 +* ab/remove-implicit-use-of-the-repository (2023-03-28) 17 commits
72 + (merged to 'next' on 2023-03-30 at e0abe2d872)
73 + + libs: use "struct repository *" argument, not "the_repository"
74 + + post-cocci: adjust comments for recent repo_* migration
75 + + cocci: apply the "revision.h" part of "the_repository.pending"
76 + + cocci: apply the "rerere.h" part of "the_repository.pending"
77 + + cocci: apply the "refs.h" part of "the_repository.pending"
78 + + cocci: apply the "promisor-remote.h" part of "the_repository.pending"
79 + + cocci: apply the "packfile.h" part of "the_repository.pending"
80 + + cocci: apply the "pretty.h" part of "the_repository.pending"
81 + + cocci: apply the "object-store.h" part of "the_repository.pending"
82 + + cocci: apply the "diff.h" part of "the_repository.pending"
83 + + cocci: apply the "commit.h" part of "the_repository.pending"
84 + + cocci: apply the "commit-reach.h" part of "the_repository.pending"
85 + + cocci: apply the "cache.h" part of "the_repository.pending"
86 + + cocci: add missing "the_repository" macros to "pending"
87 + + cocci: sort "the_repository" rules by header
88 + + cocci: fix incorrect & verbose "the_repository" rules
89 + + cocci: remove dead rule from "the_repository.pending.cocci"
90 + (this branch is used by en/header-split-cache-h.)
91
111 - "git blame --contents=<file> <rev> -- <path>" used to be forbidden,
112 - but now it finds the origins of lines starting at <file> contents
113 - through the history that leads to <rev>.
114 - source: <20230324170800.331022-1-jacob.e.keller@intel.com>
92 + Code clean-up around the use of the_repository.
93 + source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@gmail.com>
94
95
117 -* jk/document-rev-list-object-name (2023-03-28) 1 commit
118 - (merged to 'next' on 2023-03-29 at e1cd79f572)
119 - + docs: document caveats of rev-list's object-name output
96 +* ds/ahead-behind (2023-03-20) 9 commits
97 + (merged to 'next' on 2023-03-23 at a607895174)
98 + + commit-reach: add tips_reachable_from_bases()
99 + + for-each-ref: add ahead-behind format atom
100 + + commit-reach: implement ahead_behind() logic
101 + + commit-graph: introduce `ensure_generations_valid()`
102 + + commit-graph: return generation from memory
103 + + commit-graph: simplify compute_generation_numbers()
104 + + commit-graph: refactor compute_topological_levels()
105 + + for-each-ref: explicitly test no matches
106 + + for-each-ref: add --stdin option
107 + (this branch is used by ps/ahead-behind-truncation-fix.)
108
121 - Document what the pathname-looking strings in "rev-list --object"
122 - output are for and what they mean.
123 - source: <20230328182650.GC18558@coredump.intra.peff.net>
109 + "git for-each-ref" learns '%(ahead-behind:<base>)' that computes the
110 + distances from a single reference point in the history with bunch
111 + of commits in bulk.
112 + source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
113
114
126 -* jk/fast-export-cleanup (2023-03-22) 6 commits
127 - (merged to 'next' on 2023-03-27 at 12b9a9308e)
128 - + fast-export: drop unused parameter from anonymize_commit_message()
129 - + fast-export: drop data parameter from anonymous generators
130 - + fast-export: de-obfuscate --anonymize-map handling
131 - + fast-export: factor out anonymized_entry creation
132 - + fast-export: simplify initialization of anonymized hashmaps
133 - + fast-export: drop const when storing anonymized values
115 +* ds/fetch-bundle-uri-with-all (2023-03-31) 1 commit
116 + (merged to 'next' on 2023-03-31 at a9f787341d)
117 + + fetch: download bundles once, even with --all
118
135 - Code clean-up.
136 - source: <20230322173636.GA5643@coredump.intra.peff.net>
119 + "git fetch --all" does not have to download and handle the same
120 + bundleURI over and over, which has been corrected.
121 + source: <pull.1508.git.1680278344173.gitgitgadget@gmail.com>
122
123
139 -* jk/really-deprecate-pack-redundant (2023-03-23) 1 commit
140 - (merged to 'next' on 2023-03-29 at 4d1bc9ac42)
141 - + pack-redundant: escalate deprecation warning to an error
124 +* en/header-split-cleanup (2023-03-21) 16 commits
125 + (merged to 'next' on 2023-03-30 at b69ff46cad)
126 + + csum-file.h: remove unnecessary inclusion of cache.h
127 + + write-or-die.h: move declarations for write-or-die.c functions from cache.h
128 + + treewide: remove cache.h inclusion due to setup.h changes
129 + + setup.h: move declarations for setup.c functions from cache.h
130 + + treewide: remove cache.h inclusion due to environment.h changes
131 + + environment.h: move declarations for environment.c functions from cache.h
132 + + treewide: remove unnecessary includes of cache.h
133 + + wrapper.h: move declarations for wrapper.c functions from cache.h
134 + + path.h: move function declarations for path.c functions from cache.h
135 + + cache.h: remove expand_user_path()
136 + + abspath.h: move absolute path functions from cache.h
137 + + environment: move comment_line_char from cache.h
138 + + treewide: remove unnecessary cache.h inclusion from several sources
139 + + treewide: remove unnecessary inclusion of gettext.h
140 + + treewide: be explicit about dependence on gettext.h
141 + + treewide: remove unnecessary cache.h inclusion from a few headers
142 + (this branch is used by en/header-split-cache-h.)
143
143 - "git pack-redundant" gave a warning when run, as the command has
144 - outlived its usefulness long ago and is nominated for future
145 - removal. Now we escalate to give an error.
146 - source: <20230323204047.GA9290@coredump.intra.peff.net>
144 + Split key function and data structure definitions out of cache.h to
145 + new header files and adjust the users.
146 + source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
147
148
149 -* js/split-index-fixes (2023-03-27) 4 commits
150 - (merged to 'next' on 2023-03-27 at 3a7b7da0d1)
151 - + unpack-trees: take care to propagate the split-index flag
152 - + fsmonitor: avoid overriding `cache_changed` bits
153 - + split-index; stop abusing the `base_oid` to strip the "link" extension
154 - + split-index & fsmonitor: demonstrate a bug
149 +* gc/config-parsing-cleanup (2023-03-28) 8 commits
150 + (merged to 'next' on 2023-03-30 at e7ea626edf)
151 + + config.c: rename "struct config_source cf"
152 + + config: report cached filenames in die_bad_number()
153 + + config.c: remove current_parsing_scope
154 + + config.c: remove current_config_kvi
155 + + config.c: plumb the_reader through callbacks
156 + + config.c: create config_reader and the_reader
157 + + config.c: don't assign to "cf_global" directly
158 + + config.c: plumb config_source through static fns
159
156 - The index files can become corrupt under certain conditions when
157 - the split-index feature is in use, especially together with
158 - fsmonitor, which have been corrected.
159 - source: <pull.1497.v2.git.1679870743.gitgitgadget@gmail.com>
160 + Config API clean-up to reduce its dependence on static variables
161 + source: <pull.1463.v3.git.git.1680025914.gitgitgadget@gmail.com>
162
163
162 -* js/t5563-portability-fix (2023-03-31) 1 commit
163 - (merged to 'next' on 2023-03-31 at 12f95a9567)
164 - + t5563: prevent "ambiguous redirect"
164 +* jk/chainlint-fixes (2023-03-30) 5 commits
165 + (merged to 'next' on 2023-03-30 at 52f229b710)
166 + + tests: skip test_eval_ in internal chain-lint
167 + + tests: drop here-doc check from internal chain-linter
168 + + tests: diagnose unclosed here-doc in chainlint.pl
169 + + tests: replace chainlint subshell with a function
170 + + tests: run internal chain-linter under "make test"
171
166 - Test portability fix.
167 - source: <pull.1507.git.1680245525637.gitgitgadget@gmail.com>
172 + Test framework fix.
173 + source: <20230330192712.GA27719@coredump.intra.peff.net>
174
175
170 -* kh/commentchar-config-error-message (2023-03-27) 1 commit
171 - (merged to 'next' on 2023-03-27 at 7fdda0a984)
172 - + config: tell the user that we expect an ASCII character
176 +* jk/document-pack-redundant-deprecation (2023-03-30) 1 commit
177 + (merged to 'next' on 2023-03-30 at e9d10e27a4)
178 + + pack-redundant: document deprecation
179
174 - Doc update.
175 - source: <20230327194344.12910-1-code@khaugsbakk.name>
180 + Document that we have marked "pack-redundant" as deprecated.
181 + source: <20230328190641.GF18558@coredump.intra.peff.net>
182
183
178 -* mk/workaround-pcre-jit-ucp-bug (2023-03-23) 1 commit
179 - (merged to 'next' on 2023-03-24 at d6c402a77b)
180 - + grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
184 +* jk/unused-post-2.40 (2023-03-17) 4 commits
185 + (merged to 'next' on 2023-03-30 at 10aeb0d4ae)
186 + + transport: mark unused parameters in fetch_refs_from_bundle()
187 + + http: mark unused parameter in fill_active_slot() callbacks
188 + + http: drop unused parameter from start_object_request()
189 + + mailmap: drop debugging code
190
182 - A recent-ish change to allow unicode character classes to be used
183 - with "grep -P" triggered a JIT bug in older pcre2 libraries.
184 - The problematic change in Git built with these older libraries has
185 - been disabled to work around the bug.
186 - source: <20230323172539.25230-1-minipli@grsecurity.net>
191 + More "-Wunused-parameters" code clean-up.
192 + source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
193
194
189 -* ob/rollback-after-commit-lock-failure (2023-03-24) 1 commit
190 - (merged to 'next' on 2023-03-27 at ea237a011c)
191 - + sequencer: remove pointless rollback_lock_file()
195 +* jk/unused-post-2.40-part2 (2023-03-28) 7 commits
196 + (merged to 'next' on 2023-03-29 at 7aeee1b6c6)
197 + + parse-options: drop parse_opt_unknown_cb()
198 + + t/helper: mark unused argv/argc arguments
199 + + mark "argv" as unused when we check argc
200 + + builtins: mark unused prefix parameters
201 + + builtins: annotate always-empty prefix parameters
202 + + builtins: always pass prefix to parse_options()
203 + + fast-import: fix file access when run from subdir
204
193 - Code clean-up.
194 - source: <20230323162235.995529-1-oswald.buddenhagen@gmx.de>
205 + Code clean-up for "-Wunused-parameter" build.
206 + source: <20230328205253.GA1753925@coredump.intra.peff.net>
207
208
197 -* ob/sequencer-save-head-simplify (2023-03-24) 1 commit
198 - (merged to 'next' on 2023-03-27 at 388e26f1d1)
199 - + sequencer: rewrite save_head() in terms of write_message()
209 +* ow/ref-format-remove-unused-member (2023-03-30) 1 commit
210 + (merged to 'next' on 2023-03-30 at 898a5df956)
211 + + ref-filter: remove unused ref_format member
212
213 Code clean-up.
202 - source: <20230323162235.995544-1-oswald.buddenhagen@gmx.de>
203 -
204 -
205 -* pw/wildmatch-fixes (2023-03-27) 4 commits
206 - (merged to 'next' on 2023-03-27 at 40f52ba243)
207 - + t3070: make chain lint tester happy
208 - (merged to 'next' on 2023-03-24 at d0d1f23565)
209 - + wildmatch: hide internal return values
210 - + wildmatch: avoid undefined behavior
211 - + wildmatch: fix exponential behavior
212 -
213 - The wildmatch library code unlearns exponential behaviour it
214 - acquired some time ago since it was borrowed from rsync.
215 - source: <cover.1679328580.git.phillip.wood@dunelm.org.uk>
216 -
217 -
218 -* rs/archive-mtime (2023-03-27) 1 commit
219 - (merged to 'next' on 2023-03-27 at 672cd32edf)
220 - + t5000: use check_mtime()
221 -
222 - Test update.
223 - source: <233edbbe-35c1-9b5b-7578-4c70c6d24449@web.de>
214 + source: <20230330112133.4437-2-oystwa@gmail.com>
215
216
226 -* sg/parse-options-h-initializers (2023-03-20) 3 commits
227 - (merged to 'next' on 2023-03-23 at f16b3ab6d7)
228 - + parse-options.h: use designated initializers in OPT_* macros
229 - + parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
230 - + parse-options.h: use consistent name for the callback parameters
217 +* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit
218 + (merged to 'next' on 2023-03-31 at 60bc243011)
219 + + commit-graph: fix truncated generation numbers
220 + (this branch uses ds/ahead-behind.)
221
232 - Code clean-up to use designated initializers in parse-options API.
233 - source: <20230319165648.656738-1-szeder.dev@gmail.com>
222 + Fix unnecessary truncation of generation numbers used in-core.
223 + source: <f8a0a869e8b0882f05cac49d78f49ba3553d3c44.1679904401.git.ps@pks.im>
224
225
236 -* sg/parse-options-h-users (2023-03-20) 2 commits
237 - (merged to 'next' on 2023-03-23 at 2ca7d1e737)
238 - + treewide: remove unnecessary inclusions of parse-options.h from headers
239 - + treewide: include parse-options.h in source files
226 +* ps/fetch-ref-update-reporting (2023-03-20) 6 commits
227 + (merged to 'next' on 2023-03-30 at e5df1cae0b)
228 + + fetch: centralize printing of reference updates
229 + + fetch: centralize logic to print remote URL
230 + + fetch: centralize handling of per-reference format
231 + + fetch: pass the full local reference name to `format_display`
232 + + fetch: move output format into `display_state`
233 + + fetch: move reference width calculation into `display_state`
234
241 - Code clean-up to include and/or uninclude parse-options.h file as
242 - needed.
243 - source: <20230319162712.654137-1-szeder.dev@gmail.com>
235 + Clean-up of the code path that reports what "git fetch" did to each
236 + ref.
237 + source: <cover.1679315383.git.ps@pks.im>
238
239
246 -* ss/hashmap-typofix (2023-03-30) 1 commit
247 - (merged to 'next' on 2023-03-30 at ac1e443424)
248 - + hashmap.h: fix minor typo
240 +* sm/ssl-key-type-config (2023-03-23) 1 commit
241 + (merged to 'next' on 2023-03-30 at 773716fc60)
242 + + http: add support for different sslcert and sslkey types.
243
250 - Typofix.
251 - source: <pull.1506.git.1680190083688.gitgitgadget@gmail.com>
244 + Add a few configuration variables to tell the cURL library that
245 + different types of ssl-cert and ssl-key are in use.
246 + source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@gmail.com>
247
248 --------------------------------------------------
249 [New Topics]
250
256 -* ow/ref-filter-omit-empty (2023-03-30) 1 commit
257 - - branch, for-each-ref: add option to omit empty lines
258 -
259 - "git branch --format=..." and "git format-patch --format=..."
260 - learns "--omit-empty-lines" to hide refs that whose formatting
261 - result becomes an empty string from the output.
262 -
263 - Expecting a reroll. "git tag" should learn the same.
264 - cf. <xmqqilei1bgk.fsf@gitster.g>
265 - source: <20230330112133.4437-3-oystwa@gmail.com>
251 +* dw/doc-submittingpatches-grammofix (2023-04-05) 1 commit
252 + (merged to 'next' on 2023-04-05 at 2691fad020)
253 + + SubmittingPatches: clarify MUA discussion with "the"
254
255 + Originally merged to 'next' on 2023-04-05
256
268 -* ow/ref-format-remove-unused-member (2023-03-30) 1 commit
269 - (merged to 'next' on 2023-03-30 at 898a5df956)
270 - + ref-filter: remove unused ref_format member
271 -
272 - Code clean-up.
257 + Grammofix.
258
259 Will merge to 'master'.
275 - source: <20230330112133.4437-2-oystwa@gmail.com>
260 + source: <ZC0yey+S+OD/S2tt@trent-reznor>
261
262
278 -* rn/sparse-describe (2023-04-03) 1 commit
279 - - describe: enable sparse index for describe
263 +* fc/doc-manpage-base-url-fix (2023-04-05) 1 commit
264 + - doc: remove manpage-base-url workaround
265
281 - "git describe --dirty" learns to work better with sparse-index.
266 + Modernize manpage generation toolchain.
267
283 - Will merge to 'next'?
284 - source: <20230403164749.246001-1-nanth.raghul@gmail.com>
268 + Will merge to 'next'.
269 + source: <20230322000815.132128-1-felipe.contreras@gmail.com>
270
271
287 -* ds/fetch-bundle-uri-with-all (2023-03-31) 1 commit
288 - (merged to 'next' on 2023-03-31 at a9f787341d)
289 - + fetch: download bundles once, even with --all
272 +* jc/clone-object-format-from-void (2023-04-05) 1 commit
273 + - clone: propagate object-format when cloning from void
274
291 - "git fetch --all" does not have to download and handle the same
292 - bundleURI over and over, which has been corrected.
275 + "git clone" from an empty repository learned to propagate the
276 + choice of the hash algorithm from the source repository to the
277 + newly created repository.
278
294 - Will merge to 'master'.
295 - source: <pull.1508.git.1680278344173.gitgitgadget@gmail.com>
279 + Will merge to 'next'.
280 + source: <xmqq355euj2i.fsf@gitster.g>
281
282
298 -* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits
299 - (merged to 'next' on 2023-04-04 at 48861fc381)
300 - + t2107: fix mention of the_index.cache_changed
301 - + t3060: fix mention of function prune_index
283 +* rj/sendemail-validate-series-hook (2023-04-05) 1 commit
284 + - hooks: add sendemail-validate-series
285
303 - Comment updates.
286 + "git send-email" learns a new hook that takes the entire set of
287 + patch files from its standard input to validate them in one go,
288 + instead of getting called once per each file.
289
305 - Will merge to 'master'.
306 - source: <20230331143604.82040-2-rybak.a.v@gmail.com>
290 + Comments?
291 + source: <20230405231305.96996-1-robin@jarry.cc>
292
293
309 -* ah/format-patch-thread-doc (2023-04-03) 1 commit
310 - - format-patch: correct documentation of --thread without an argument
294 +* tk/mergetool-gui-default-config (2023-04-05) 1 commit
295 + - mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
296
312 - Doc update.
297 + "git mergetool" and "git difftool" learns a new configuration
298 + guiDefault to optionally favor configured guitool over non-gui-tool
299 + automatically when $DISPLAY is set.
300
314 - source: <20230403040724.642513-1-alexhenrie24@gmail.com>
301 + Will merge to 'next'.
302 + source: <pull.1381.v4.git.1679153263217.gitgitgadget@gmail.com>
303
304
317 -* ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits
318 - - t2019: don't create unused files
319 - - t1502: don't create unused files
320 - - t1450: don't create unused files
321 - - t1300: don't create unused files
322 - - t1300: fix config file syntax error descriptions
323 - - t0300: don't create unused file
305 +* cm/branch-delete-error-message-update (2023-04-06) 1 commit
306 + - branch: improve error log on branch not found by checking remotes refs
307
325 - Test cleanup.
308 + "git branch -d origin/master" would say "no such branch", but it is
309 + likely a missed "-r" if refs/remotes/origin/master exists. The
310 + command has been taught to give such a hint in its error message.
311
312 Will merge to 'next'?
328 - source: <20230403223338.468025-1-rybak.a.v@gmail.com>
329 -
330 -
331 -* en/header-split-cache-h (2023-04-04) 25 commits
332 - - mailmap, quote: move declarations of global vars to correct unit
333 - - treewide: reduce includes of cache.h in other headers
334 - - treewide: remove double forward declaration of read_in_full
335 - - strbuf: move forward declarations to beginning of file
336 - - cache.h: remove unnecessary includes
337 - - treewide: remove cache.h inclusion due to pager.h changes
338 - - pager.h: move declarations for pager.c functions from cache.h
339 - - treewide: remove cache.h inclusion due to editor.h changes
340 - - editor: move editor-related functions and declarations into common file
341 - - treewide: remove cache.h inclusion due to object.h changes
342 - - object.h: move some inline functions and defines from cache.h
343 - - treewide: remove cache.h inclusion due to object-file.h changes
344 - - object-file.h: move declarations for object-file.c functions from cache.h
345 - - treewide: remove cache.h inclusion due to git-zlib changes
346 - - git-zlib: move declarations for git-zlib functions from cache.h
347 - - treewide: remove cache.h inclusion due to object-name.h changes
348 - - object-name.h: move declarations for object-name.c functions from cache.h
349 - - treewide: remove unnecessary cache.h inclusion
350 - - treewide: be explicit about dependence on mem-pool.h
351 - - treewide: be explicit about dependence on oid-array.h
352 - - treewide: be explicit about dependence on pack-revindex.h
353 - - treewide: be explicit about dependence on convert.h
354 - - treewide: be explicit about dependence on advice.h
355 - - treewide: be explicit about dependence on trace.h & trace2.h
356 - - Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
357 - (this branch uses ab/remove-implicit-use-of-the-repository and en/header-split-cleanup.)
313 + source: <pull.1476.v3.git.git.1680695000257.gitgitgadget@gmail.com>
314
359 - Header clean-up.
315
361 - source: <pull.1509.v2.git.1680571348.gitgitgadget@gmail.com>
316 +* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit
317 + - doc: asciidoc: remove custom header macro
318
319 + Doc toolchain update to remove old workaround for AsciiDoc.
320
364 -* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit
365 - - object-info: init request_info before reading arg
366 -
367 - Correct use of an uninitialized structure member.
321 + Will merge to 'next'?
322 + source: <20230323221523.52472-1-felipe.contreras@gmail.com>
323
369 - Will merge to 'next'.
370 - source: <20230402130557.17662-1-worldhello.net@gmail.com>
324
325 +* jk/use-perl-path-consistently (2023-04-06) 1 commit
326 + - t/lib-httpd: pass PERL_PATH to CGI scripts
327
373 -* sl/sparse-write-tree (2023-04-04) 1 commit
374 - - write-tree: integrate with sparse index
375 -
376 - "git write-tree" learns to work better with sparse-index.
328 + Tests had a few places where we ignored PERL_PATH and blindly used
329 + /usr/bin/perl, which have been corrected.
330
331 Will merge to 'next'.
379 - source: <20230404003539.1578245-1-cheskaqiqi@gmail.com>
332 + source: <20230406093602.GD2215039@coredump.intra.peff.net>
333
334 --------------------------------------------------
335 [Stalled]
@@ -439,51 +392,150 @@ Release tarballs are available at:
392 source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
393
394
395 +* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
396 + - test-lib: allow storing counts with test harnesses
397 +
398 + Allow summary results from tests to be written to t/test-results
399 + directory even when a test harness like 'prove' is in use.
400 +
401 + Expecting a reroll.
402 + cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
403 + source: <20221224225200.1027806-1-adam@dinwoodie.org>
404 +
405 +
406 +* so/diff-merges-more (2022-12-18) 5 commits
407 + - diff-merges: improve --diff-merges documentation
408 + - diff-merges: issue warning on lone '-m' option
409 + - diff-merges: support list of values for --diff-merges
410 + - diff-merges: implement log.diffMerges-m-imply-p config
411 + - diff-merges: implement [no-]hide option and log.diffMergesHide config
412 +
413 + Assorted updates to "--diff-merges=X" option.
414 +
415 + May want to discard. Breaking compatibility does not seem worth it.
416 + source: <20221217132955.108542-1-sorganov@gmail.com>
417 +
418 +--------------------------------------------------
419 +[Cooking]
420 +
421 +* ow/ref-filter-omit-empty (2023-04-06) 1 commit
422 + - branch, for-each-ref: add option to omit empty lines
423 +
424 + "git branch --format=..." and "git format-patch --format=..."
425 + learns "--omit-empty" to hide refs that whose formatting result
426 + becomes an empty string from the output.
427 +
428 + Looking good.
429 + source: <20230406170837.10060-3-oystwa@gmail.com>
430 +
431 +
432 * jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit
433 (merged to 'next' on 2023-04-04 at 4cfa5997eb)
434 + e-mail workflow: Message-ID is spelled with ID in both capital letters
435
436 + Originally merged to 'next' on 2023-04-04
437 +
438 Consistently spell "Message-ID" as such, not "Message-Id".
439
440 Will merge to 'master'.
441 source: <xmqqsfhgnmqg.fsf@gitster.g>
442
443
452 -* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
453 - - test-lib: allow storing counts with test harnesses
444 +* rn/sparse-describe (2023-04-03) 1 commit
445 + - describe: enable sparse index for describe
446 +
447 + "git describe --dirty" learns to work better with sparse-index.
448 +
449 + Will merge to 'next'?
450 + source: <20230403164749.246001-1-nanth.raghul@gmail.com>
451 +
452 +
453 +* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits
454 + (merged to 'next' on 2023-04-04 at 48861fc381)
455 + + t2107: fix mention of the_index.cache_changed
456 + + t3060: fix mention of function prune_index
457 +
458 + Originally merged to 'next' on 2023-04-04
459 +
460 + Comment updates.
461 +
462 + Will merge to 'master'.
463 + source: <20230331143604.82040-2-rybak.a.v@gmail.com>
464 +
465 +
466 +* ah/format-patch-thread-doc (2023-04-03) 1 commit
467 + - format-patch: correct documentation of --thread without an argument
468 +
469 + Doc update.
470 + source: <20230403040724.642513-1-alexhenrie24@gmail.com>
471 +
472 +
473 +* ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits
474 + - t2019: don't create unused files
475 + - t1502: don't create unused files
476 + - t1450: don't create unused files
477 + - t1300: don't create unused files
478 + - t1300: fix config file syntax error descriptions
479 + - t0300: don't create unused file
480 +
481 + Test cleanup.
482 +
483 + Will merge to 'next'?
484 + source: <20230403223338.468025-1-rybak.a.v@gmail.com>
485 +
486 +
487 +* en/header-split-cache-h (2023-04-04) 25 commits
488 + - mailmap, quote: move declarations of global vars to correct unit
489 + - treewide: reduce includes of cache.h in other headers
490 + - treewide: remove double forward declaration of read_in_full
491 + - strbuf: move forward declarations to beginning of file
492 + - cache.h: remove unnecessary includes
493 + - treewide: remove cache.h inclusion due to pager.h changes
494 + - pager.h: move declarations for pager.c functions from cache.h
495 + - treewide: remove cache.h inclusion due to editor.h changes
496 + - editor: move editor-related functions and declarations into common file
497 + - treewide: remove cache.h inclusion due to object.h changes
498 + - object.h: move some inline functions and defines from cache.h
499 + - treewide: remove cache.h inclusion due to object-file.h changes
500 + - object-file.h: move declarations for object-file.c functions from cache.h
501 + - treewide: remove cache.h inclusion due to git-zlib changes
502 + - git-zlib: move declarations for git-zlib functions from cache.h
503 + - treewide: remove cache.h inclusion due to object-name.h changes
504 + - object-name.h: move declarations for object-name.c functions from cache.h
505 + - treewide: remove unnecessary cache.h inclusion
506 + - treewide: be explicit about dependence on mem-pool.h
507 + - treewide: be explicit about dependence on oid-array.h
508 + - treewide: be explicit about dependence on pack-revindex.h
509 + - treewide: be explicit about dependence on convert.h
510 + - treewide: be explicit about dependence on advice.h
511 + - treewide: be explicit about dependence on trace.h & trace2.h
512 + - Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
513
455 - Allow summary results from tests to be written to t/test-results
456 - directory even when a test harness like 'prove' is in use.
514 + Header clean-up.
515
458 - Expecting a reroll.
459 - cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
460 - source: <20221224225200.1027806-1-adam@dinwoodie.org>
516 + Will merge to 'next'?
517 + source: <pull.1509.v2.git.1680571348.gitgitgadget@gmail.com>
518
519
463 -* so/diff-merges-more (2022-12-18) 5 commits
464 - - diff-merges: improve --diff-merges documentation
465 - - diff-merges: issue warning on lone '-m' option
466 - - diff-merges: support list of values for --diff-merges
467 - - diff-merges: implement log.diffMerges-m-imply-p config
468 - - diff-merges: implement [no-]hide option and log.diffMergesHide config
520 +* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit
521 + (merged to 'next' on 2023-04-05 at d56fe6eedc)
522 + + object-info: init request_info before reading arg
523
470 - Assorted updates to "--diff-merges=X" option.
524 + Originally merged to 'next' on 2023-04-05
525
472 - May want to discard. Breaking compatibility does not seem worth it.
473 - source: <20221217132955.108542-1-sorganov@gmail.com>
526 + Correct use of an uninitialized structure member.
527
475 ---------------------------------------------------
476 -[Cooking]
528 + Will merge to 'master'.
529 + source: <20230402130557.17662-1-worldhello.net@gmail.com>
530
478 -* sm/ssl-key-type-config (2023-03-23) 1 commit
479 - (merged to 'next' on 2023-03-30 at 773716fc60)
480 - + http: add support for different sslcert and sslkey types.
531
482 - Add a few configuration variables to tell the cURL library that
483 - different types of ssl-cert and ssl-key are in use.
532 +* sl/sparse-write-tree (2023-04-04) 1 commit
533 + - write-tree: integrate with sparse index
534
485 - Will merge to 'master'.
486 - source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@gmail.com>
535 + "git write-tree" learns to work better with sparse-index.
536 +
537 + Will merge to 'next'.
538 + source: <20230404003539.1578245-1-cheskaqiqi@gmail.com>
539
540
541 * ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
@@ -497,22 +549,13 @@ Release tarballs are available at:
549 source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
550
551
500 -* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit
501 - (merged to 'next' on 2023-03-31 at 60bc243011)
502 - + commit-graph: fix truncated generation numbers
503 - (this branch uses ds/ahead-behind.)
504 -
505 - Fix unnecessary truncation of generation numbers used in-core.
506 -
507 - Will merge to 'master'.
508 - source: <f8a0a869e8b0882f05cac49d78f49ba3553d3c44.1679904401.git.ps@pks.im>
509 -
510 -
552 * ws/sparse-check-rules (2023-03-27) 2 commits
553 (merged to 'next' on 2023-04-04 at 17a29244a6)
554 + builtin/sparse-checkout: add check-rules command
555 + builtin/sparse-checkout: remove NEED_WORK_TREE flag
556
557 + Originally merged to 'next' on 2023-04-04
558 +
559 "git sparse-checkout" command learns a debugging aid for the sparse
560 rule definitions.
561
@@ -540,30 +583,6 @@ Release tarballs are available at:
583 source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
584
585
543 -* jk/chainlint-fixes (2023-03-30) 5 commits
544 - (merged to 'next' on 2023-03-30 at 52f229b710)
545 - + tests: skip test_eval_ in internal chain-lint
546 - + tests: drop here-doc check from internal chain-linter
547 - + tests: diagnose unclosed here-doc in chainlint.pl
548 - + tests: replace chainlint subshell with a function
549 - + tests: run internal chain-linter under "make test"
550 -
551 - Test framework fix.
552 -
553 - Will merge to 'master'.
554 - source: <20230330192712.GA27719@coredump.intra.peff.net>
555 -
556 -
557 -* jk/document-pack-redundant-deprecation (2023-03-30) 1 commit
558 - (merged to 'next' on 2023-03-30 at e9d10e27a4)
559 - + pack-redundant: document deprecation
560 -
561 - Document that we have marked "pack-redundant" as deprecated.
562 -
563 - Will merge to 'master'.
564 - source: <20230328190641.GF18558@coredump.intra.peff.net>
565 -
566 -
586 * ob/revert-of-revert (2023-03-28) 1 commit
587 - sequencer: call a revert of a revert "reapply"
588
@@ -574,22 +593,6 @@ Release tarballs are available at:
593 source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de>
594
595
577 -* jk/unused-post-2.40-part2 (2023-03-28) 7 commits
578 - (merged to 'next' on 2023-03-29 at 7aeee1b6c6)
579 - + parse-options: drop parse_opt_unknown_cb()
580 - + t/helper: mark unused argv/argc arguments
581 - + mark "argv" as unused when we check argc
582 - + builtins: mark unused prefix parameters
583 - + builtins: annotate always-empty prefix parameters
584 - + builtins: always pass prefix to parse_options()
585 - + fast-import: fix file access when run from subdir
586 -
587 - Code clean-up for "-Wunused-parameter" build.
588 -
589 - Will merge to 'master'.
590 - source: <20230328205253.GA1753925@coredump.intra.peff.net>
591 -
592 -
596 * pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
597 - rebase -i: do not update "done" when rescheduling command
598
@@ -617,39 +620,14 @@ Release tarballs are available at:
620 + pack-bitmap.c: hide bitmap internals in `read_be32()`
621 + pack-bitmap.c: hide bitmap internals in `read_u8()`
622
623 + Originally merged to 'next' on 2023-03-21
624 +
625 Clean-up the pack-bitmap codepath.
626
627 On hold. There is a BUG() on data errors.
628 source: <cover.1679342296.git.me@ttaylorr.com>
629
630
626 -* en/header-split-cleanup (2023-03-21) 16 commits
627 - (merged to 'next' on 2023-03-30 at b69ff46cad)
628 - + csum-file.h: remove unnecessary inclusion of cache.h
629 - + write-or-die.h: move declarations for write-or-die.c functions from cache.h
630 - + treewide: remove cache.h inclusion due to setup.h changes
631 - + setup.h: move declarations for setup.c functions from cache.h
632 - + treewide: remove cache.h inclusion due to environment.h changes
633 - + environment.h: move declarations for environment.c functions from cache.h
634 - + treewide: remove unnecessary includes of cache.h
635 - + wrapper.h: move declarations for wrapper.c functions from cache.h
636 - + path.h: move function declarations for path.c functions from cache.h
637 - + cache.h: remove expand_user_path()
638 - + abspath.h: move absolute path functions from cache.h
639 - + environment: move comment_line_char from cache.h
640 - + treewide: remove unnecessary cache.h inclusion from several sources
641 - + treewide: remove unnecessary inclusion of gettext.h
642 - + treewide: be explicit about dependence on gettext.h
643 - + treewide: remove unnecessary cache.h inclusion from a few headers
644 - (this branch is used by en/header-split-cache-h.)
645 -
646 - Split key function and data structure definitions out of cache.h to
647 - new header files and adjust the users.
648 -
649 - Will merge to 'master'.
650 - source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
651 -
652 -
631 * nw/for-each-ref-signature (2023-03-13) 1 commit
632 . ref-filter: add new "signature" atom
633
@@ -680,74 +658,16 @@ Release tarballs are available at:
658 source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
659
660
683 -* ps/fetch-ref-update-reporting (2023-03-20) 6 commits
684 - (merged to 'next' on 2023-03-30 at e5df1cae0b)
685 - + fetch: centralize printing of reference updates
686 - + fetch: centralize logic to print remote URL
687 - + fetch: centralize handling of per-reference format
688 - + fetch: pass the full local reference name to `format_display`
689 - + fetch: move output format into `display_state`
690 - + fetch: move reference width calculation into `display_state`
691 -
692 - Clean-up of the code path that reports what "git fetch" did to each
693 - ref.
694 -
695 - Will merge to 'master'.
696 - source: <cover.1679315383.git.ps@pks.im>
697 -
698 -
699 -* pw/rebase-cleanup-merge-strategy-option-handling (2023-03-15) 5 commits
661 +* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-05) 5 commits
662 - rebase: remove a couple of redundant strategy tests
663 - rebase -m: fix serialization of strategy options
664 - rebase -m: cleanup --strategy-option handling
665 + - sequencer: use struct strvec to store merge strategy options
666 - rebase: stop reading and writing unnecessary strategy state
704 - - Merge branch 'ab/fix-strategy-opts-parsing'
667
668 Clean-up of the code path that deals with merge strategy option
669 handling in "git rebase".
708 -
709 - Needs review.
710 - source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
711 -
712 -
713 -* ab/remove-implicit-use-of-the-repository (2023-03-28) 17 commits
714 - (merged to 'next' on 2023-03-30 at e0abe2d872)
715 - + libs: use "struct repository *" argument, not "the_repository"
716 - + post-cocci: adjust comments for recent repo_* migration
717 - + cocci: apply the "revision.h" part of "the_repository.pending"
718 - + cocci: apply the "rerere.h" part of "the_repository.pending"
719 - + cocci: apply the "refs.h" part of "the_repository.pending"
720 - + cocci: apply the "promisor-remote.h" part of "the_repository.pending"
721 - + cocci: apply the "packfile.h" part of "the_repository.pending"
722 - + cocci: apply the "pretty.h" part of "the_repository.pending"
723 - + cocci: apply the "object-store.h" part of "the_repository.pending"
724 - + cocci: apply the "diff.h" part of "the_repository.pending"
725 - + cocci: apply the "commit.h" part of "the_repository.pending"
726 - + cocci: apply the "commit-reach.h" part of "the_repository.pending"
727 - + cocci: apply the "cache.h" part of "the_repository.pending"
728 - + cocci: add missing "the_repository" macros to "pending"
729 - + cocci: sort "the_repository" rules by header
730 - + cocci: fix incorrect & verbose "the_repository" rules
731 - + cocci: remove dead rule from "the_repository.pending.cocci"
732 - (this branch is used by en/header-split-cache-h.)
733 -
734 - Code clean-up around the use of the_repository.
735 -
736 - Will merge to 'master'.
737 - source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@gmail.com>
738 -
739 -
740 -* jk/unused-post-2.40 (2023-03-17) 4 commits
741 - (merged to 'next' on 2023-03-30 at 10aeb0d4ae)
742 - + transport: mark unused parameters in fetch_refs_from_bundle()
743 - + http: mark unused parameter in fill_active_slot() callbacks
744 - + http: drop unused parameter from start_object_request()
745 - + mailmap: drop debugging code
746 -
747 - More "-Wunused-parameters" code clean-up.
748 -
749 - Will merge to 'master'.
750 - source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
670 + source: <cover.1680708043.git.phillip.wood@dunelm.org.uk>
671
672
673 * sl/diff-files-sparse (2023-03-22) 2 commits
@@ -760,44 +680,6 @@ Release tarballs are available at:
680 source: <20230322161820.3609-1-cheskaqiqi@gmail.com>
681
682
763 -* ds/ahead-behind (2023-03-20) 9 commits
764 - (merged to 'next' on 2023-03-23 at a607895174)
765 - + commit-reach: add tips_reachable_from_bases()
766 - + for-each-ref: add ahead-behind format atom
767 - + commit-reach: implement ahead_behind() logic
768 - + commit-graph: introduce `ensure_generations_valid()`
769 - + commit-graph: return generation from memory
770 - + commit-graph: simplify compute_generation_numbers()
771 - + commit-graph: refactor compute_topological_levels()
772 - + for-each-ref: explicitly test no matches
773 - + for-each-ref: add --stdin option
774 - (this branch is used by ps/ahead-behind-truncation-fix.)
775 -
776 - "git for-each-ref" learns '%(ahead-behind:<base>)' that computes the
777 - distances from a single reference point in the history with bunch
778 - of commits in bulk.
779 -
780 - Will merge to 'master' together with ps/ahead-behind-truncation-fix topic.
781 - source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
782 -
783 -
784 -* gc/config-parsing-cleanup (2023-03-28) 8 commits
785 - (merged to 'next' on 2023-03-30 at e7ea626edf)
786 - + config.c: rename "struct config_source cf"
787 - + config: report cached filenames in die_bad_number()
788 - + config.c: remove current_parsing_scope
789 - + config.c: remove current_config_kvi
790 - + config.c: plumb the_reader through callbacks
791 - + config.c: create config_reader and the_reader
792 - + config.c: don't assign to "cf_global" directly
793 - + config.c: plumb config_source through static fns
794 -
795 - Config API clean-up to reduce its dependence on static variables
796 -
797 - Will merge to 'master'.
798 - source: <pull.1463.v3.git.git.1680025914.gitgitgadget@gmail.com>
799 -
800 -
683 * my/wildmatch-cleanups (2023-02-27) 5 commits
684 . wildmatch: more cleanups after killing uchar
685 . wildmatch: use char instead of uchar
@@ -871,24 +753,6 @@ Release tarballs are available at:
753 source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
754
755
874 -* ab/config-multi-and-nonbool (2023-03-28) 9 commits
875 - (merged to 'next' on 2023-03-30 at bcfe99b43d)
876 - + for-each-repo: with bad config, don't conflate <path> and <cmd>
877 - + config API: add "string" version of *_value_multi(), fix segfaults
878 - + config API users: test for *_get_value_multi() segfaults
879 - + for-each-repo: error on bad --config
880 - + config API: have *_multi() return an "int" and take a "dest"
881 - + versioncmp.c: refactor config reading next commit
882 - + config API: add and use a "git_config_get()" family of functions
883 - + config tests: add "NULL" tests for *_get_value_multi()
884 - + config tests: cover blind spots in git_die_config() tests
885 -
886 - Assorted config API updates.
887 -
888 - Will merge to 'master'.
889 - source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@gmail.com>
890 -
891 -
756 * cb/checkout-same-branch-twice (2023-03-22) 2 commits
757 - SQUASH??? the test marked to expect failure passes from day one
758 - checkout/switch: disallow checking out same branch in multiple worktrees