@matheusbsbs / matheus-bagliano / commits / 2e9913c5ff

What's cooking (2022/11 #07)

Junio C Hamano committed Nov 29, 2022 at 13:24 UTC 2e9913c5ffb95cae4a056738b51de550064e7e97
1 file changed +220 -342
whats-cooking.txt
+220 -342
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Nov 2022, #06; Wed, 23)
3 -X-master-at: c000d916380bb59db69c78546928eadd076b9c7d
4 -X-next-at: 9c59682cddd1d198c7580288e5e56416d50f0591
2 +Subject: What's cooking in git.git (Nov 2022, #07; Tue, 29)
3 +X-master-at: 083e01275b81eb6105247ec522adf280d99f6b56
4 +X-next-at: c39a3162a331d3f49d7e0a5cc5b2e86db4d1a447
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Nov 2022, #06; Wed, 23)
7 +What's cooking in git.git (Nov 2022, #07; Tue, 29)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -47,251 +47,216 @@ Release tarballs are available at:
47 --------------------------------------------------
48 [Graduated to 'master']
49
50 -* ab/coccicheck-incremental (2022-11-11) 14 commits
51 - (merged to 'next' on 2022-11-14 at 8a70133571)
52 - + Makefile: don't create a ".build/.build/" for cocci, fix output
53 - (merged to 'next' on 2022-11-08 at 0f3c55d4c2)
54 - + spatchcache: add a ccache-alike for "spatch"
55 - + cocci: run against a generated ALL.cocci
56 - + cocci rules: remove <id>'s from rules that don't need them
57 - + Makefile: copy contrib/coccinelle/*.cocci to build/
58 - + cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
59 - + cocci: make "coccicheck" rule incremental
60 - + cocci: split off "--all-includes" from SPATCH_FLAGS
61 - + cocci: split off include-less "tests" from SPATCH_FLAGS
62 - + Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
63 - + Makefile: have "coccicheck" re-run if flags change
64 - + Makefile: add ability to TAB-complete cocci *.patch rules
65 - + cocci rules: remove unused "F" metavariable from pending rule
66 - + Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
67 -
68 - "make coccicheck" is time consuming. It has been made to run more
69 - incrementally.
70 - source: <221109.86tu38p1x8.gmgdl@evledraar.gmail.com>
71 - source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com>
72 -
73 -
74 -* ab/submodule-helper-prep-only (2022-11-08) 9 commits
75 - (merged to 'next' on 2022-11-08 at c0c4f4d1c3)
76 - + submodule--helper: use OPT_SUBCOMMAND() API
77 - + submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
78 - + submodule--helper: remove --prefix from "absorbgitdirs"
79 - + submodule API & "absorbgitdirs": remove "----recursive" option
80 - + submodule.c: refactor recursive block out of absorb function
81 - + submodule tests: test for a "foreach" blind-spot
82 - + submodule--helper: fix a memory leak in "status"
83 - + submodule tests: add tests for top-level flag output
84 - + submodule--helper: move "config" to a test-tool
85 - (this branch is used by ab/remove--super-prefix.)
50 +* ab/doc-synopsis-and-cmd-usage (2022-11-27) 1 commit
51 + (merged to 'next' on 2022-11-28 at a517ea2f95)
52 + + i18n: fix command template placeholder format
53
87 - Preparation to remove git-submodule.sh and replace it with a builtin.
88 - source: <cover-v2-0.9-00000000000-20221108T140501Z-avarab@gmail.com>
54 + Doc and message fix.
55 + source: <pull.1435.git.1669483442230.gitgitgadget@gmail.com>
56
57
91 -* ab/t7610-timeout (2022-11-15) 2 commits
92 - (merged to 'next' on 2022-11-15 at 9dadac032a)
93 - + t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
94 - (merged to 'next' on 2022-11-14 at 82a4abdb1d)
95 - + t7610: fix flaky timeout issue, don't clone from example.com
58 +* ab/fewer-the-index-macros (2022-11-21) 11 commits
59 + (merged to 'next' on 2022-11-23 at de20206cac)
60 + + cocci: apply "pending" index-compatibility to some "builtin/*.c"
61 + + cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
62 + + {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
63 + + cocci: apply "pending" index-compatibility to "t/helper/*.c"
64 + + cocci & cache.h: apply variable section of "pending" index-compatibility
65 + + cocci & cache.h: apply a selection of "pending" index-compatibility
66 + + cocci: add a index-compatibility.pending.cocci
67 + + read-cache API & users: make discard_index() return void
68 + + cocci & cache.h: remove rarely used "the_index" compat macros
69 + + builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
70 + + cache.h: remove unused "the_index" compat macros
71
97 - Fix a source of flakiness in CI when compiling with SANITIZE=leak.
98 - source: <patch-1.1-21a9cb49299-20221115T233516Z-avarab@gmail.com>
72 + Progress on removing 'the_index' convenience wrappers.
73 + source: <cover-v2-00.11-00000000000-20221119T125550Z-avarab@gmail.com>
74
75
101 -* dd/bisect-helper-subcommand (2022-11-11) 3 commits
102 - (merged to 'next' on 2022-11-14 at 066f19c4fe)
103 - + bisect--helper: parse subcommand with OPT_SUBCOMMAND
104 - + bisect--helper: move all subcommands into their own functions
105 - + bisect--helper: remove unused options
106 - (this branch is used by dd/git-bisect-builtin.)
107 -
108 - Fix a regression in the bisect-helper which mistakenly treats
109 - arguments to the command given to 'git bisect run' as arguments to
110 - the helper.
111 - source: <cover.1668097286.git.congdanhqx@gmail.com>
112 -
113 -
114 -* es/chainlint-lineno (2022-11-11) 4 commits
115 - (merged to 'next' on 2022-11-18 at 20c9692235)
116 - + chainlint: prefix annotated test definition with line numbers
117 - + chainlint: latch line numbers at which each token starts and ends
118 - + chainlint: sidestep impoverished macOS "terminfo"
119 - + Merge branch 'es/chainlint-output' into es/chainlint-lineno
120 - (this branch uses es/chainlint-output.)
121 -
122 - Teach chainlint.pl to show corresponding line numbers when printing
123 - the source of a test.
124 - source: <pull.1413.v2.git.1668152094.gitgitgadget@gmail.com>
125 -
126 -
127 -* es/chainlint-output (2022-11-08) 4 commits
128 - (merged to 'next' on 2022-11-14 at 9cd7d30183)
129 - + chainlint: annotate original test definition rather than token stream
130 - + chainlint: latch start/end position of each token
131 - + chainlint: tighten accuracy when consuming input stream
132 - + chainlint: add explanatory comments
133 - (this branch is used by es/chainlint-lineno.)
134 -
135 - Teach chainlint.pl to annotate the original test definition instead
136 - of the token stream.
137 - source: <pull.1375.git.git.1667934510.gitgitgadget@gmail.com>
138 -
139 -
140 -* ew/delta-islands-free (2022-11-18) 1 commit
141 - (merged to 'next' on 2022-11-18 at 7c4899e0cb)
142 - + delta-islands: free island-related data after use
143 -
144 - Free structures related to delta islands after use.
145 - source: <20221117230658.M516129@dcvr>
146 -
147 -
148 -* gc/redact-h2h3-headers (2022-11-14) 2 commits
149 - (merged to 'next' on 2022-11-14 at 34157d24e9)
150 - + http: redact curl h2h3 headers in info
151 - + t: run t5551 tests with both HTTP and HTTP/2
152 -
153 - Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
154 - others.
155 - source: <pull.1377.v3.git.git.1668206106.gitgitgadget@gmail.com>
156 -
157 -
158 -* js/remove-stale-scalar-repos (2022-11-11) 2 commits
159 - (merged to 'next' on 2022-11-14 at e1c86051c4)
160 - + tests(scalar): tighten the stale `scalar.repo` test some
161 - (merged to 'next' on 2022-11-08 at 6d598a3b80)
162 - + scalar reconfigure -a: remove stale `scalar.repo` entries
76 +* ah/chainlint-cpuinfo-parse-fix (2022-11-23) 1 commit
77 + (merged to 'next' on 2022-11-28 at 1e51eafde5)
78 + + chainlint.pl: fix /proc/cpuinfo regexp
79
164 - 'scalar reconfigure -a' is taught to automatically remove
165 - scalar.repo entires which no longer exist.
166 - source: <pull.1415.git.1668065327120.gitgitgadget@gmail.com>
80 + The format of a line in /proc/cpuinfo that describes a CPU on s390x
81 + looked different from everybody else, and the code in chainlint.pl
82 + failed to parse it.
83 + source: <pull.1385.git.git.1669148861635.gitgitgadget@gmail.com>
84
85
169 -* jt/submodule-on-demand (2022-11-14) 1 commit
170 - (merged to 'next' on 2022-11-18 at a89ee23abb)
171 - + Doc: document push.recurseSubmodules=only
86 +* es/locate-httpd-module-location-in-test (2022-11-22) 1 commit
87 + (merged to 'next' on 2022-11-23 at dfa19a744f)
88 + + lib-httpd: extend module location auto-detection
89
173 - Push all submodules recursively with
174 - '--recurse-submodules=on-demand'.
175 - source: <20221114213713.2341945-1-jonathantanmy@google.com>
90 + Add one more candidate directory that may house httpd modules while
91 + running tests.
92 + source: <pull.1426.git.1668999695898.gitgitgadget@gmail.com>
93
94
178 -* mg/notes-newline (2022-11-16) 1 commit
179 - (merged to 'next' on 2022-11-18 at b20234698d)
180 - + notes: avoid empty line in template
95 +* ew/prune-with-missing-objects-pack (2022-11-21) 1 commit
96 + (merged to 'next' on 2022-11-23 at bd328c5d01)
97 + + prune: quiet ENOENT on missing directories
98 +
99 + "git prune" may try to iterate over .git/objects/pack for trash
100 + files to remove in it, and loudly fail when the directory is
101 + missing, which is not necessary. The command has been taught to
102 + ignore such a failure.
103 + source: <20221119201213.2398081-1-e@80x24.org>
104 +
105 +
106 +* gc/resolve-alternate-symlinks (2022-11-25) 1 commit
107 + (merged to 'next' on 2022-11-28 at 509d2005aa)
108 + + object-file: use real paths when adding alternates
109 +
110 + Resolve symbolic links when processing the locations of alternate
111 + object stores, since failing to do so can lead to confusing and buggy
112 + behavior.
113 + source: <pull.1382.v3.git.git.1669251331340.gitgitgadget@gmail.com>
114 +
115
182 - Avoid a stray empty newline in the template when creating new notes.
183 - source: <347ee7ad6fea7cf96bb1e51772802102082b58cc.1668614158.git.git@grubix.eu>
116 +* jh/trace2-timers-and-counters (2022-11-25) 1 commit
117 + (merged to 'next' on 2022-11-28 at 2fa64103b7)
118 + + trace2 tests: guard pthread test with "PTHREAD"
119
120 + Test fix.
121 + source: <patch-1.1-f7f21c94a6c-20221124T214813Z-avarab@gmail.com>
122
186 -* mh/gitcredentials-generate (2022-11-14) 1 commit
187 - (merged to 'next' on 2022-11-18 at 99f2365d6b)
188 - + Docs: describe how a credential-generating helper works
123
190 - Doc update.
191 - source: <pull.1379.git.git.1668217470500.gitgitgadget@gmail.com>
124 +* jk/parse-object-type-mismatch (2022-11-22) 3 commits
125 + (merged to 'next' on 2022-11-22 at 69dc60536b)
126 + + parse_object(): simplify blob conditional
127 + (merged to 'next' on 2022-11-18 at 1ee133a089)
128 + + parse_object(): check on-disk type of suspected blob
129 + + parse_object(): drop extra "has" check before checking object type
130 + (this branch is used by ab/tag-object-type-errors.)
131 +
132 + `parse_object()` hardening when checking for the existence of a
133 + suspected blob object.
134 + source: <Y3vQ/6QcTEFfpjLt@coredump.intra.peff.net>
135
136
194 -* ps/receive-use-only-advertised (2022-11-17) 7 commits
195 - (merged to 'next' on 2022-11-18 at e4a288a7a5)
196 - + receive-pack: only use visible refs for connectivity check
197 - + rev-parse: add `--exclude-hidden=` option
198 - + revision: add new parameter to exclude hidden refs
199 - + revision: introduce struct to handle exclusions
200 - + revision: move together exclusion-related functions
201 - + refs: get rid of global list of hidden refs
202 - + refs: fix memory leak when parsing hideRefs config
137 +* jx/ci-ubuntu-fix (2022-11-27) 4 commits
138 + (merged to 'next' on 2022-11-28 at 2eaa5b6c61)
139 + + ci: install python on ubuntu
140 + + ci: use the same version of p4 on both Linux and macOS
141 + + ci: remove the pipe after "p4 -V" to catch errors
142 + + github-actions: run gcc-8 on ubuntu-20.04 image
143
204 - "git receive-pack" used to use all the local refs as the boundary for
205 - checking connectivity of the data "git push" sent, but now it uses
206 - only the refs that it advertised to the pusher. In a repository with
207 - the .hideRefs configuration, this reduces the resources needed to
208 - perform the check.
209 - cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
210 - cf. <xmqqr0yrizqm.fsf@gitster.g>
211 - source: <cover.1668663795.git.ps@pks.im>
144 + Adjust the GitHub CI to newer ubuntu release.
145 + source: <20221124153934.12470-1-worldhello.net@gmail.com>
146
147
214 -* pw/rebase-no-reflog-action (2022-11-09) 2 commits
215 - (merged to 'next' on 2022-11-14 at 790dadc8d3)
216 - + rebase: stop exporting GIT_REFLOG_ACTION
217 - + sequencer: stop exporting GIT_REFLOG_ACTION
218 - (this branch is used by ab/various-leak-fixes.)
148 +* km/merge-recursive-typofix (2022-11-27) 1 commit
149 + (merged to 'next' on 2022-11-28 at cb6c488e9c)
150 + + merge-recursive: fix variable typo in error message
151
220 - Avoid setting GIT_REFLOG_ACTION to improve readability of the
221 - sequencer internals.
222 - source: <31df037eafede799c2ef27df66c6da309b719b1b.1668003719.git.gitgitgadget@gmail.com>
152 + Fix an old typo in an error message.
153 + source: <20221125173745.738643-1-kyle@kyleam.com>
154
155
225 -* pw/strict-label-lookups (2022-11-10) 2 commits
226 - (merged to 'next' on 2022-11-14 at 7db4398d23)
227 - + sequencer: tighten label lookups
228 - + sequencer: unify label lookup
156 +* pw/config-int-parse-fixes (2022-11-09) 3 commits
157 + (merged to 'next' on 2022-11-23 at 06ee2fff7b)
158 + + git_parse_signed(): avoid integer overflow
159 + + config: require at least one digit when parsing numbers
160 + + git_parse_unsigned: reject negative values
161
230 - Correct an error where `git rebase` would mistakenly use a branch or
231 - tag named "refs/rewritten/xyz" when missing a rebase label.
232 - source: <pull.1414.git.1668098622.gitgitgadget@gmail.com>
162 + Assorted fixes of parsing end-user input as integers.
163 + source: <pull.1389.v2.git.1668003388.gitgitgadget@gmail.com>
164
165
235 -* rp/maintenance-qol (2022-11-15) 4 commits
236 - (merged to 'next' on 2022-11-15 at be4379029c)
237 - + builtin/gc.c: fix use-after-free in maintenance_unregister()
238 - (merged to 'next' on 2022-11-15 at 53dc6c8b0d)
239 - + maintenance --unregister: fix uninit'd data use & -Wdeclaration-after-statement
240 - (merged to 'next' on 2022-11-14 at 17db40bf26)
241 - + maintenance: add option to register in a specific config
242 - + for-each-repo: interpolate repo path arguments
166 +* rs/list-objects-filter-leakfix (2022-11-21) 1 commit
167 + (merged to 'next' on 2022-11-23 at 1e148fc7d2)
168 + + list-objects-filter: plug combine_filter_data leak
169
244 - 'git maintenance register' is taught to write configuration to an
245 - arbitrary path, and 'git for-each-repo' is taught to expand tilde
246 - characters in paths.
247 - source: <20221109190708.22725-1-ronan@rjp.ie>
248 - source: <patch-1.1-54d405f15f1-20221115T080212Z-avarab@gmail.com>
170 + Leakfix.
171 + source: <bc25ac8c-ce9a-2385-be0d-0c72798d319d@web.de>
172
173
251 -* sz/macos-fsmonitor-symlinks (2022-11-08) 1 commit
252 - (merged to 'next' on 2022-11-18 at ad972b3819)
253 - + fsmonitor--daemon: on macOS support symlink
174 +* sg/plug-line-log-leaks (2022-11-02) 3 commits
175 + (merged to 'next' on 2022-11-23 at 5d2e1b065b)
176 + + diff.c: use diff_free_queue()
177 + + line-log: free the diff queues' arrays when processing merge commits
178 + + line-log: free diff queue when processing non-merge commits
179
255 - Fix an issue where core.fsmonitor on macOS would not notice created
256 - or modified symbolic links.
257 - source: <pull.1406.git.1667885119570.gitgitgadget@gmail.com>
180 + A handful of leaks in the line-log machinery have been plugged.
181 + source: <20221102220142.574890-1-szeder.dev@gmail.com>
182
183
260 -* tb/howto-maintain-git-fixes (2022-10-31) 2 commits
261 - (merged to 'next' on 2022-11-18 at e631f9f305)
262 - + Documentation: build redo-seen.sh from jch..seen
263 - + Documentation: build redo-jch.sh from master..jch
184 +* zk/push-use-bitmaps (2022-11-22) 1 commit
185 + (merged to 'next' on 2022-11-23 at 2ce20bcaf5)
186 + + t5516: fail to run in verbose mode
187
265 - A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
266 - source: <cover.1667260044.git.me@ttaylorr.com>
188 + Test fix.
189 + source: <20221121134040.12260-1-worldhello.net@gmail.com>
190
191 --------------------------------------------------
192 [New Topics]
193
271 -* ah/chainlint-cpuinfo-parse-fix (2022-11-23) 1 commit
272 - - chainlint.pl: fix /proc/cpuinfo regexp
194 +* rr/status-untracked-advice (2022-11-25) 1 commit
195 + - status: modernize git-status "slow untracked files" advice
196
274 - The format of a line in /proc/cpuinfo that describes a CPU on s390x
275 - looked different from everybody else, and the code in chainlint.pl
276 - failed to parse it.
197 + The advice message given by "git status" when it takes long time to
198 + enumerate untracked paths has been updated.
199
278 - Will merge to 'next'.
279 - source: <pull.1385.git.git.1669148861635.gitgitgadget@gmail.com>
200 + Will merge to 'next'?
201 + source: <pull.1384.v8.git.1669154823035.gitgitgadget@gmail.com>
202
203
282 -* yn/git-jump-emacs (2022-11-23) 2 commits
283 - - git-jump: invoke emacs/emacsclient
284 - - git-jump: add an optional argument '--stdout'
204 +* sa/git-var-empty (2022-11-27) 2 commits
205 + - var: allow GIT_EDITOR to return null
206 + - var: do not print usage() with a correct invocation
207
286 - "git jump" (in contrib/) learned to present the "quickfix list" to
287 - its standard output (instead of letting it consumed by the editor
288 - it invokes), and learned to also drive emacs/emacsclient.
208 + "git var UNKNOWN_VARIABLE" and "git var VARIABLE" with the variable
209 + given an empty value used to behave identically. Now the latter
210 + just gives an empty output, while the former still gives an error
211 + message.
212 +
213 + Will merge to 'next'?
214 + source: <pull.1434.v3.git.1669472277.gitgitgadget@gmail.com>
215 +
216 +
217 +* jx/t1301-updates (2022-11-29) 3 commits
218 + - t1301: do not change $CWD in "shared=all" test case
219 + - t1301: use test_when_finished for cleanup
220 + - t1301: fix wrong template dir for git-init
221 +
222 + Test updates.
223 +
224 + Seems to break CI.
225 + source: <20221127145130.16155-1-worldhello.net@gmail.com>
226
290 - Expecting a reroll.
291 - cf. <Y30VQzJ93h98hVhH@coredump.intra.peff.net>
292 - cf. <Y30a0ulfxyE7dnYi@coredump.intra.peff.net>
293 - cf. <<CAF5D8-vMLNzi4F06MoLvWV3XBe62B6VTqtXs4VCjsFKMVQkv-A@mail.gmail.com>
294 - source: <pull.1423.v4.git.1669126703.gitgitgadget@gmail.com>
227 +
228 +* km/send-email-with-v-reroll-count (2022-11-27) 1 commit
229 + - send-email: relay '-v N' to format-patch
230 +
231 + "git send-email -v 3" used to be expanded to "git send-email
232 + --validate 3" when the user meant to pass them down to
233 + "format-patch", which has been corrected.
234 +
235 + Seems to break CI.
236 + source: <87edtp5uws.fsf@kyleam.com>
237 +
238 +
239 +* ps/gnumake-4.4-fix (2022-11-28) 1 commit
240 + (merged to 'next' on 2022-11-29 at 1151bc06fc)
241 + + Makefile: avoid multiple patterns when recipes generate one file
242 +
243 + Adjust Makefile for GNU make 4.4
244 +
245 + Will cook in 'next'.
246 + source: <20221127224251.2508200-2-psmith@gnu.org>
247 +
248 +
249 +* so/diff-merges-more (2022-11-28) 5 commits
250 + - diff-merges: issue warning on lone '-m' option
251 + - diff-merges: support list of values for --diff-merges
252 + - diff-merges: implement log.diffMergesForce config
253 + - diff-merges: implement log.diffMerges-m-imply-p config
254 + - diff-merges: implement [no-]hide option and log.diffMergesHide config
255 +
256 + Assorted updates to "--diff-merges=X" option.
257 + Seems to break CI.
258 + cf. https://github.com/git/git/actions/runs/3560918726
259 + source: <20221127093721.31012-1-sorganov@gmail.com>
260
261 --------------------------------------------------
262 [Stalled]
@@ -304,24 +269,6 @@ Release tarballs are available at:
269 source: <20221111194223.644845-2-michael.strawbridge@amd.com>
270
271
307 -* ab/config-multi-and-nonbool (2022-11-02) 9 commits
308 - . for-each-repo: with bad config, don't conflate <path> and <cmd>
309 - . config API: add "string" version of *_value_multi(), fix segfaults
310 - . config API users: test for *_get_value_multi() segfaults
311 - . for-each-repo: error on bad --config
312 - . config API: have *_multi() return an "int" and take a "dest"
313 - . versioncmp.c: refactor config reading next commit
314 - . config tests: add "NULL" tests for *_get_value_multi()
315 - . config tests: cover blind spots in git_die_config() tests
316 - . for-each-repo tests: test bad --config keys
317 -
318 - A mixed bag of config API updates.
319 -
320 - Waiting for review.
321 - cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
322 - source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
323 -
324 -
272 * hl/archive-recursive (2022-10-19) 10 commits
273 . fixup! archive: add tests for git archive --recurse-submodules
274 . archive: add tests for git archive --recurse-submodules
@@ -409,7 +356,7 @@ Release tarballs are available at:
356 source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
357
358
412 -* ed/fsmonitor-inotify (2022-11-16) 6 commits
359 +* ed/fsmonitor-inotify (2022-11-25) 6 commits
360 - fsmonitor: update doc for Linux
361 - fsmonitor: test updates
362 - fsmonitor: enable fsmonitor for Linux
@@ -420,8 +367,7 @@ Release tarballs are available at:
367 Bundled fsmonitor for Linux using inotify API.
368
369 Needs review on the updated round.
423 - Occasional breakages of t7527.16??
424 - source: <pull.1352.v3.git.git.1668641019.gitgitgadget@gmail.com>
370 + source: <pull.1352.v4.git.git.1669230044.gitgitgadget@gmail.com>
371
372
373 * ag/merge-strategies-in-c (2022-08-10) 14 commits
@@ -477,48 +423,35 @@ Release tarballs are available at:
423 --------------------------------------------------
424 [Cooking]
425
480 -* ew/prune-with-missing-objects-pack (2022-11-21) 1 commit
481 - (merged to 'next' on 2022-11-23 at bd328c5d01)
482 - + prune: quiet ENOENT on missing directories
483 -
484 - "git prune" may try to iterate over .git/objects/pack for trash
485 - files to remove in it, and loudly fail when the directory is
486 - missing, which is not necessary. The command has been taught to
487 - ignore such a failure.
488 -
489 - Will merge to 'master'.
490 - source: <20221119201213.2398081-1-e@80x24.org>
426 +* ab/config-multi-and-nonbool (2022-11-27) 9 commits
427 + - for-each-repo: with bad config, don't conflate <path> and <cmd>
428 + - config API: add "string" version of *_value_multi(), fix segfaults
429 + - config API users: test for *_get_value_multi() segfaults
430 + - for-each-repo: error on bad --config
431 + - config API: have *_multi() return an "int" and take a "dest"
432 + - versioncmp.c: refactor config reading next commit
433 + - config tests: add "NULL" tests for *_get_value_multi()
434 + - config tests: cover blind spots in git_die_config() tests
435 + - for-each-repo tests: test bad --config keys
436
437 + Assorted config API updates.
438
493 -* rs/list-objects-filter-leakfix (2022-11-21) 1 commit
494 - (merged to 'next' on 2022-11-23 at 1e148fc7d2)
495 - + list-objects-filter: plug combine_filter_data leak
496 -
497 - Leakfix.
498 -
499 - Will merge to 'master'.
500 - source: <bc25ac8c-ce9a-2385-be0d-0c72798d319d@web.de>
501 -
502 -
503 -* es/locate-httpd-module-location-in-test (2022-11-22) 1 commit
504 - (merged to 'next' on 2022-11-23 at dfa19a744f)
505 - + lib-httpd: extend module location auto-detection
506 -
507 - Add one more candidate directory that may house httpd modules while
508 - running tests.
509 -
510 - Will merge to 'master'.
511 - source: <pull.1426.git.1668999695898.gitgitgadget@gmail.com>
439 + Waiting for review.
440 + source: <cover-v3-0.9-00000000000-20221125T093158Z-avarab@gmail.com>
441
442
514 -* zk/push-use-bitmaps (2022-11-22) 1 commit
515 - (merged to 'next' on 2022-11-23 at 2ce20bcaf5)
516 - + t5516: fail to run in verbose mode
443 +* yn/git-jump-emacs (2022-11-27) 3 commits
444 + (merged to 'next' on 2022-11-29 at d0960938a0)
445 + + git-jump: invoke emacs/emacsclient
446 + + git-jump: move valid-mode check earlier
447 + + git-jump: add an optional argument '--stdout'
448
518 - Test fix.
449 + "git jump" (in contrib/) learned to present the "quickfix list" to
450 + its standard output (instead of letting it consumed by the editor
451 + it invokes), and learned to also drive emacs/emacsclient.
452
520 - Will merge to 'master'.
521 - source: <20221121134040.12260-1-worldhello.net@gmail.com>
453 + Will cook in 'next'.
454 + source: <pull.1423.v8.git.1669511933.gitgitgadget@gmail.com>
455
456
457 * sa/cat-file-mailmap--batch-check (2022-11-21) 2 commits
@@ -527,27 +460,10 @@ Release tarballs are available at:
460
461 'cat-file' gains mailmap support for its '--batch-check' and '-s'
462 options.
530 - source: <20221120074852.121346-1-siddharthasthana31@gmail.com>
531 -
463
533 -* ab/fewer-the-index-macros (2022-11-21) 11 commits
534 - (merged to 'next' on 2022-11-23 at de20206cac)
535 - + cocci: apply "pending" index-compatibility to some "builtin/*.c"
536 - + cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
537 - + {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
538 - + cocci: apply "pending" index-compatibility to "t/helper/*.c"
539 - + cocci & cache.h: apply variable section of "pending" index-compatibility
540 - + cocci & cache.h: apply a selection of "pending" index-compatibility
541 - + cocci: add a index-compatibility.pending.cocci
542 - + read-cache API & users: make discard_index() return void
543 - + cocci & cache.h: remove rarely used "the_index" compat macros
544 - + builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
545 - + cache.h: remove unused "the_index" compat macros
546 -
547 - Progress on removing 'the_index' convenience wrappers.
548 -
549 - Will merge to 'master'.
550 - source: <cover-v2-00.11-00000000000-20221119T125550Z-avarab@gmail.com>
464 + Seems to break CI.
465 + cf. https://github.com/git/git/actions/runs/3560918726
466 + source: <20221120074852.121346-1-siddharthasthana31@gmail.com>
467
468
469 * ab/tag-object-type-errors (2022-11-22) 5 commits
@@ -556,7 +472,6 @@ Release tarballs are available at:
472 - object tests: add test for unexpected objects in tags
473 - object-file.c: free the "t.tag" in check_tag()
474 - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
559 - (this branch uses jk/parse-object-type-mismatch.)
475
476 Hardening checks around mismatched object types when one of those
477 objects is a tag.
@@ -565,39 +480,13 @@ Release tarballs are available at:
480 source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
481
482
568 -* gc/resolve-alternate-symlinks (2022-11-22) 1 commit
569 - - object-file: use real paths when adding alternates
570 -
571 - Resolve symbolic links when processing the locations of alternate
572 - object stores, since failing to do so can lead to confusing and buggy
573 - behavior.
574 -
575 - Will merge to 'next'.
576 - source: <pull.1382.v2.git.git.1669074557348.gitgitgadget@gmail.com>
577 -
578 -
579 -* jk/parse-object-type-mismatch (2022-11-22) 3 commits
580 - (merged to 'next' on 2022-11-22 at 69dc60536b)
581 - + parse_object(): simplify blob conditional
582 - (merged to 'next' on 2022-11-18 at 1ee133a089)
583 - + parse_object(): check on-disk type of suspected blob
584 - + parse_object(): drop extra "has" check before checking object type
585 - (this branch is used by ab/tag-object-type-errors.)
586 -
587 - `parse_object()` hardening when checking for the existence of a
588 - suspected blob object.
589 -
590 - Will merge to 'master'.
591 - source: <Y3vQ/6QcTEFfpjLt@coredump.intra.peff.net>
592 -
593 -
483 * js/range-diff-mbox (2022-11-23) 1 commit
484 - range-diff: support reading mbox files
485
486 'git range-diff' gained support for reading either side from an .mbox
487 file instead of a revision range.
488
600 - Review sent.
489 + Expecting review responses.
490 source: <pull.1420.v3.git.1669108102092.gitgitgadget@gmail.com>
491
492
@@ -623,17 +512,19 @@ Release tarballs are available at:
512 --pattern=<pattern>" was introduced.
513
514 Waiting for review response, but leaning negative.
515 + Seems to break CI.
516 + cf. https://github.com/git/git/actions/runs/3560918726
517 source: <20221117113023.65865-1-tenglong.tl@alibaba-inc.com>
518
519
629 -* tr/am--no-verify (2022-11-18) 1 commit
520 +* tr/am--no-verify (2022-11-29) 1 commit
521 - am: Allow passing --no-verify flag
522
523 Conditionally skip the pre-applypatch and applypatch-msg hooks when
524 applying patches with 'git am'.
525
635 - Expecting another round.
636 - source: <20221118132743.3525725-1-thierry.reding@gmail.com>
526 + Expecting a (hopefully final) reroll.
527 + source: <20221128174825.1510407-1-thierry.reding@gmail.com>
528
529
530 * ab/remove--super-prefix (2022-11-21) 12 commits
@@ -738,6 +629,7 @@ Release tarballs are available at:
629 Introduce a case insensitive mode to the Bash completion helpers.
630
631 Waiting for review.
632 + Seems to break CI.
633 source: <pull.1374.git.git.1667669315.gitgitgadget@gmail.com>
634
635
@@ -849,22 +741,14 @@ Release tarballs are available at:
741 Bundle URIs part 4.
742
743 Waiting for review.
744 + Seems to break CI.
745 + cf. https://github.com/git/git/actions/runs/3560918726
746 source: <pull.1400.v2.git.1668628302.gitgitgadget@gmail.com>
747
748
855 -* sg/plug-line-log-leaks (2022-11-02) 3 commits
856 - (merged to 'next' on 2022-11-23 at 5d2e1b065b)
857 - + diff.c: use diff_free_queue()
858 - + line-log: free the diff queues' arrays when processing merge commits
859 - + line-log: free diff queue when processing non-merge commits
860 -
861 - A handful of leaks in the line-log machinery have been plugged.
862 -
863 - Will merge to 'master'.
864 - source: <20221102220142.574890-1-szeder.dev@gmail.com>
865 -
866 -
867 -* tl/pack-bitmap-absolute-paths (2022-11-14) 2 commits
749 +* tl/pack-bitmap-absolute-paths (2022-11-29) 4 commits
750 + - pack-bitmap.c: trace bitmap ignore logs when midx-bitmap is found
751 + - pack-bitmap.c: break out of the bitmap loop early if not tracing
752 (merged to 'next' on 2022-11-14 at 34eb0ea05a)
753 + pack-bitmap.c: avoid exposing absolute paths
754 + pack-bitmap.c: remove unnecessary "open_pack_index()" calls
@@ -872,9 +756,8 @@ Release tarballs are available at:
756 The pack-bitmap machinery is taught to log the paths of redundant
757 bitmap(s) to trace2 instead of stderr.
758
875 - Waiting for two follow-on patches.
876 - cf. <xmqqbkozvqbt.fsf@gitster.g>
877 - source: <cover.1668063122.git.dyroneteng@gmail.com>
759 + Will merge to 'next'.
760 + source: <cover.1669644101.git.dyroneteng@gmail.com>
761
762
763 * ab/cmake-nix-and-ci (2022-11-04) 14 commits
@@ -913,7 +796,9 @@ Release tarballs are available at:
796 source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>
797
798
916 -* kz/merge-tree-merge-base (2022-11-12) 2 commits
799 +* kz/merge-tree-merge-base (2022-11-25) 3 commits
800 + (merged to 'next' on 2022-11-25 at 298ca8e2e8)
801 + + docs: fix description of the `--merge-base` option
802 (merged to 'next' on 2022-11-14 at 76d48ae21f)
803 + merge-tree.c: allow specifying the merge-base when --stdin is passed
804 + merge-tree.c: add --merge-base=<commit> option
@@ -922,6 +807,7 @@ Release tarballs are available at:
807
808 Will cook in 'next'.
809 source: <pull.1397.v7.git.1668210314.gitgitgadget@gmail.com>
810 + source: <c21466d1db0e7f7fcd7308b61aa1e3cd4e3d67c4.1669261026.git.gitgitgadget@gmail.com>
811
812
813 * po/pretty-hard-trunc (2022-11-13) 1 commit
@@ -960,18 +846,6 @@ Release tarballs are available at:
846 source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
847
848
963 -* pw/config-int-parse-fixes (2022-11-09) 3 commits
964 - (merged to 'next' on 2022-11-23 at 06ee2fff7b)
965 - + git_parse_signed(): avoid integer overflow
966 - + config: require at least one digit when parsing numbers
967 - + git_parse_unsigned: reject negative values
968 -
969 - Assorted fixes of parsing end-user input as integers.
970 -
971 - Will merge to 'master'.
972 - source: <pull.1389.v2.git.1668003388.gitgitgadget@gmail.com>
973 -
974 -
849 * cc/filtered-repack (2022-11-23) 2 commits
850 - repack: add --filter=<filter-spec> option
851 - pack-objects: allow --filter without --stdout
@@ -980,6 +854,8 @@ Release tarballs are available at:
854 again from the promissor remote.
855
856 Needs review.
857 + Seems to break CI.
858 + cf. https://github.com/git/git/actions/runs/3560918726
859 source: <20221122175150.366828-1-christian.couder@gmail.com>
860
861
@@ -999,4 +875,6 @@ Release tarballs are available at:
875 Extending credential helper protocol.
876
877 Needs review.
878 + Seems to break CI.
879 + cf. https://github.com/git/git/actions/runs/3562942886/jobs/5985179202
880 source: <pull.1352.v3.git.1667426969.gitgitgadget@gmail.com>