@matheusbsbs / matheus-bagliano / commits / 56913890e1

What's cooking (2022/07 #08)

Junio C Hamano committed Jul 29, 2022 at 16:13 UTC 56913890e19ba6350770fcb70cb91831f66e139b
1 file changed +433 -290
whats-cooking.txt
+433 -290
@@ -1,9 +1,9 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Jul 2022, #07; Fri, 22)
3 -X-master-at: 6a475b71f8c4ce708d69fdc9317aefbde3769e25
4 -X-next-at: a8f742fd52ac1e242fca73527be643aa60514c94
2 +Subject: What's cooking in git.git (Jul 2022, #08; Fri, 29)
3 +X-master-at: 23b219f8e3f2adfb0441e135f0a880e6124f766c
4 +X-next-at: 78731f0fdbef5bf997eda274d67cbd79ffaaf815
5
6 -What's cooking in git.git (Jul 2022, #07; Fri, 22)
6 +What's cooking in git.git (Jul 2022, #08; Fri, 29)
7 --------------------------------------------------
8
9 Here are the topics that have been cooking in my tree. Commits
@@ -43,72 +43,75 @@ Release tarballs are available at:
43 --------------------------------------------------
44 [Graduated to 'master']
45
46 -* gc/bare-repo-discovery (2022-07-14) 5 commits
47 - (merged to 'next' on 2022-07-15 at 5206577852)
48 - + setup.c: create `safe.bareRepository`
49 - + safe.directory: use git_protected_config()
50 - + config: learn `git_protected_config()`
51 - + Documentation: define protected configuration
52 - + Documentation/git-config.txt: add SCOPES section
46 +* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit
47 + (merged to 'next' on 2022-07-19 at f77cd40c29)
48 + + trace2: only include "fsync" events if we git_fsync()
49
54 - Introduce a discovery.barerepository configuration variable that
55 - allows users to forbid discovery of bare repositories.
56 - source: <pull.1261.v8.git.git.1657834081.gitgitgadget@gmail.com>
50 + Omit fsync-related trace2 entries when their values are all zero.
51 + source: <patch-v3-1.1-979dea5956a-20220718T102747Z-avarab@gmail.com>
52
53
59 -* js/ci-github-workflow-markup (2022-07-14) 1 commit
60 - (merged to 'next' on 2022-07-15 at 196166f671)
61 - + tests: fix incorrect --write-junit-xml code
54 +* ds/doc-wo-whitelist (2022-07-19) 5 commits
55 + (merged to 'next' on 2022-07-20 at ec51c6269a)
56 + + transport.c: avoid "whitelist"
57 + + t: avoid "whitelist"
58 + + git.txt: remove redundant language
59 + + git-cvsserver: clarify directory list
60 + + daemon: clarify directory arguments
61
63 - A fix for a regression in test framework.
64 - source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com>
62 + Avoid "white/black-list" in documentation and code comments.
63 + source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com>
64
65
67 -* js/shortlog-sort-stably (2022-07-14) 1 commit
68 - (merged to 'next' on 2022-07-15 at 75e4efe678)
69 - + shortlog: use a stable sort
66 +* ds/win-syslog-compiler-fix (2022-07-19) 1 commit
67 + (merged to 'next' on 2022-07-20 at d38b649b18)
68 + + compat/win32: correct for incorrect compiler warning
69
71 - "git shortlog -n" relied on the underlying qsort() to be stable,
72 - which shouldn't have. Fixed.
73 - source: <pull.1290.git.1657813429221.gitgitgadget@gmail.com>
70 + Workaround for a false positive compiler warning.
71 + source: <pull.1294.git.1658256354725.gitgitgadget@gmail.com>
72
73
76 -* js/vimdiff-quotepath-fix (2022-07-14) 1 commit
77 - (merged to 'next' on 2022-07-15 at 4273bbd4b4)
78 - + mergetool(vimdiff): allow paths to contain spaces again
74 +* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit
75 + (merged to 'next' on 2022-07-19 at bcc29d823d)
76 + + commit-graph: pass repo_settings instead of repository
77
80 - Variable quoting fix in the vimdiff driver of "git mergetool"
81 - source: <pull.1287.v2.git.1657809063728.gitgitgadget@gmail.com>
78 + API tweak to make it easier to run fuzz testing on commit-graph parser.
79 + source: <fd70b6119153b165a62ee4f693dbe47031cfb2be.1657834657.git.steadmon@google.com>
80
81
84 -* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit
85 - (merged to 'next' on 2022-07-15 at 4dd4a117ec)
86 - + mingw: avoid mktemp() in mkstemp() implementation
82 +* ld/osx-keychain-usage-fix (2022-07-19) 1 commit
83 + (merged to 'next' on 2022-07-20 at eebd316ef6)
84 + + osx-keychain: fix compiler warning
85
88 - mkstemp() emulation on Windows has been improved.
89 - source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de>
86 + Workaround for a compiler warning against use of die() in
87 + osx-keychain (in contrib/).
88 + source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com>
89
91 ---------------------------------------------------
92 -[New Topics]
90
94 -* ab/leak-check (2022-07-20) 14 commits
95 - - CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks
96 - - upload-pack: fix a memory leak in create_pack_file()
97 - - leak tests: mark passing SANITIZE=leak tests as leak-free
98 - - test-lib: have the "check" mode for SANITIZE=leak consider leak logs
99 - - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode
100 - - test-lib: simplify by removing test_external
101 - - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh
102 - - t/Makefile: don't remove test-results in "clean-except-prove-cache"
103 - - test-lib: add a SANITIZE=leak logging mode
104 - - t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description
105 - - test-lib: add a --invert-exit-code switch
106 - - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT
107 - - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
108 - - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_
91 +* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit
92 + (merged to 'next' on 2022-07-19 at c259b61b0e)
93 + + config/core.txt: fix minor issues for `core.sparseCheckoutCone`
94 +
95 + Docfix.
96 + source: <20220718100530.2068354-1-martin.agren@gmail.com>
97
110 - Plugging more leaks.
111 - source: <cover-v2-00.14-00000000000-20220720T211221Z-avarab@gmail.com>
98 +
99 +* ma/t4200-update (2022-07-18) 1 commit
100 + (merged to 'next' on 2022-07-19 at 710d0cafd9)
101 + + t4200: drop irrelevant code
102 +
103 + Test fix.
104 + source: <20220718154322.2177166-1-martin.agren@gmail.com>
105 +
106 +
107 +* mb/config-document-include (2022-07-17) 1 commit
108 + (merged to 'next' on 2022-07-19 at 8267b80aa2)
109 + + config.txt: document include, includeIf
110 +
111 + Add missing documentation for "include" and "includeIf" features in
112 + "git config" file format, which incidentally teaches the command
113 + line completion to include them in its offerings.
114 + source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com>
115
116
117 * mb/p4-fixes (2022-07-20) 2 commits
@@ -117,8 +120,6 @@ Release tarballs are available at:
120 + git-p4: fix typo in P4Submit.applyCommit()
121
122 Fix a few issues in "git p4".
120 -
121 - Will merge to 'master'.
123 source: <pull.1297.v2.git.git.1658343330.gitgitgadget@gmail.com>
124
125
@@ -128,50 +129,259 @@ Release tarballs are available at:
129
130 "git p4" working on UTF-16 files on Windows did not implement
131 CRLF-to-LF conversion correctly, which has been corrected.
132 + source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com>
133 +
134 +
135 +* sg/index-format-doc-update (2022-07-18) 1 commit
136 + (merged to 'next' on 2022-07-19 at ccc384be5e)
137 + + index-format.txt: remove outdated list of supported extensions
138 +
139 + Docfix.
140 + source: <20220718085640.7395-1-szeder.dev@gmail.com>
141 +
142 +
143 +* tl/pack-bitmap-error-messages (2022-07-18) 6 commits
144 + (merged to 'next' on 2022-07-19 at 3f9565653a)
145 + + pack-bitmap.c: continue looping when first MIDX bitmap is found
146 + + pack-bitmap.c: using error() instead of silently returning -1
147 + + pack-bitmap.c: do not ignore error when opening a bitmap file
148 + + pack-bitmap.c: rename "idx_name" to "bitmap_name"
149 + + pack-bitmap.c: mark more strings for translations
150 + + pack-bitmap.c: fix formatting of error messages
151 +
152 + Tweak various messages that come from the pack-bitmap codepaths.
153 + source: <cover.1658159745.git.dyroneteng@gmail.com>
154 +
155 +
156 +* vd/scalar-doc (2022-07-18) 2 commits
157 + (merged to 'next' on 2022-07-20 at fab0234da4)
158 + + scalar: convert README.md into a technical design doc
159 + + scalar: reword command documentation to clarify purpose
160 +
161 + Doc update.
162 + source: <pull.1275.v2.git.1657584367.gitgitgadget@gmail.com>
163 +
164 +--------------------------------------------------
165 +[New Topics]
166 +
167 +* tb/cat-file-z (2022-07-22) 2 commits
168 + (merged to 'next' on 2022-07-28 at 78731f0fdb)
169 + + builtin/cat-file.c: support NUL-delimited input with `-z`
170 + + t1006: extract --batch-command inputs to variables
171 +
172 + Operating modes like "--batch" of "git cat-file" command learned to
173 + take NUL-terminated input, instead of one-item-per-line.
174
175 Will merge to 'master'.
133 - source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com>
176 + source: <cover.1658532524.git.me@ttaylorr.com>
177 +
178 +
179 +* ab/tech-docs-to-help (2022-07-23) 9 commits
180 + - docs: move multi-pack-index docs to man section 5
181 + - docs: move http-protocol docs to man section 5
182 + - docs: move pack format docs to man section 5
183 + - docs: move protocol-related docs to man section 5
184 + - docs: move commit-graph format docs to man section 5
185 + - git docs: add a category for file formats, protocols and interfaces
186 + - git docs: add a category for user-facing file, repo and command UX
187 + - git help doc: use "<doc>" instead of "<guide>"
188 + - help.c: BUG() out if "help --guides" can't remove "git" prefixes
189 +
190 + Expose a lot of "tech docs" via "git help" interface.
191 + source: <cover-v5-0.9-00000000000-20220721T160721Z-avarab@gmail.com>
192 +
193 +
194 +* sg/parse-options-subcommand (2022-07-25) 20 commits
195 + - builtin/worktree.c: let parse-options parse subcommands
196 + - builtin/stash.c: let parse-options parse subcommands
197 + - builtin/sparse-checkout.c: let parse-options parse subcommands
198 + - builtin/remote.c: let parse-options parse subcommands
199 + - builtin/reflog.c: let parse-options parse subcommands
200 + - builtin/notes.c: let parse-options parse subcommands
201 + - builtin/multi-pack-index.c: let parse-options parse subcommands
202 + - builtin/hook.c: let parse-option parse subcommands
203 + - builtin/gc.c: let parse-options parse 'git maintenance's subcommands
204 + - builtin/commit-graph.c: let parse-options parse subcommands
205 + - builtin/bundle.c: let parse-options parse subcommands
206 + - parse-options: add support for parsing subcommands
207 + - parse-options: drop leading space from '--git-completion-helper' output
208 + - parse-options: clarify the limitations of PARSE_OPT_NODASH
209 + - parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
210 + - api-parse-options.txt: fix description of OPT_CMDMODE
211 + - t0040-parse-options: test parse_options() with various 'parse_opt_flags'
212 + - t5505-remote.sh: check the behavior without a subcommand
213 + - t3301-notes.sh: check that default operation mode doesn't take arguments
214 + - git.c: update NO_PARSEOPT markings
215 +
216 + Introduce the "subcommand" mode to parse-options API and update the
217 + command line parser of Git commands with subcommands.
218 + source: <20220725123857.2773963-1-szeder.dev@gmail.com>
219 +
220 +
221 +* ds/bundle-uri-clone (2022-07-25) 5 commits
222 + - clone: --bundle-uri cannot be combined with --depth
223 + - bundle-uri: add support for http(s):// and file://
224 + - clone: add --bundle-uri option
225 + - bundle-uri: create basic file-copy logic
226 + - remote-curl: add 'get' capability
227
228 + Implement "git clone --bundle-uri".
229 + source: <pull.1300.git.1658781277.gitgitgadget@gmail.com>
230
136 -* jc/string-list-cleanup (2022-07-20) 1 commit
137 - - builtin/remote.c: use the right kind of STRING_LIST_INIT
231
139 - Code clean-up.
232 +* ca/unignore-local-installation-on-windows (2022-07-27) 1 commit
233 + - cmake: support local installations of git
234 +
235 + Fix build procedure for Windows that uses CMake so that it can pick
236 + up the shell interpreter from local installation location.
237
238 Will merge to 'next'.
142 - source: <xmqq7d471dns.fsf@gitster.g>
239 + source: <pull.1304.git.1658912756815.gitgitgadget@gmail.com>
240
241
145 -* mt/pkt-line-comment-tweak (2022-07-22) 1 commit
146 - (merged to 'next' on 2022-07-22 at 4004fa75eb)
147 - + pkt-line.h: move comment closer to the associated code
242 +* ds/decorate-filter-tweak (2022-07-29) 10 commits
243 + - fetch: use ref_namespaces during prefetch
244 + - maintenance: stop writing log.excludeDecoration
245 + - log: create log.decorateFilter=all
246 + - log: add --decorate-all option
247 + - log: add default decoration filter
248 + - log-tree: use ref_namespaces instead of if/else-if
249 + - refs: use ref_namespaces for replace refs base
250 + - refs: add array of ref namespaces
251 + - t4207: test coloring of grafted decorations
252 + - refs: allow "HEAD" as decoration filter
253 +
254 + The namespaces used by "log --decorate" from "refs/" hierarchy by
255 + default has been tightened.
256 + source: <pull.1301.v2.git.1659122979.gitgitgadget@gmail.com>
257
149 - In-code comment clarification.
258 +
259 +* gc/bare-repo-discovery (2022-07-26) 1 commit
260 + (merged to 'next' on 2022-07-28 at 1d2bef98f6)
261 + + config.c: NULL check when reading protected config
262 +
263 + Fix-up for what has been merged to 'master' recently.
264
265 Will merge to 'master'.
152 - source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br>
266 + source: <pull.1299.v2.git.git.1658874067077.gitgitgadget@gmail.com>
267
268
155 -* mt/rot13-in-c (2022-07-22) 3 commits
156 - - t/t0021: replace old rot13-filter.pl uses with new test-tool cmd
157 - - t/t0021: convert the rot13-filter.pl script to C
158 - - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
159 - (this branch uses mt/checkout-count-fix.)
269 +* jr/gitweb-title-shortening (2022-07-26) 1 commit
270 + (merged to 'next' on 2022-07-28 at 7528e87220)
271 + + gitweb: remove title shortening heuristics
272
161 - Test portability improvements.
273 + Gitweb had legacy URL shortener that is specific to the way
274 + projects hosted on kernel.org used to (but no longer) work, which
275 + has been removed.
276
163 - Needs review.
164 - source: <cover.1658518769.git.matheus.bernardino@usp.br>
277 + Will merge to 'master'.
278 + source: <20220726135911.ycvgwbkixb3ei6w3@jrouhaud>
279
280
167 -* tk/untracked-cache-with-uall (2022-07-22) 1 commit
168 - - read-cache: make `do_read_index()` always set up `istate->repo`
281 +* es/doc-creation-factor-fix (2022-07-28) 2 commits
282 + - range-diff: clarify --creation-factor=<factor>
283 + - format-patch: clarify --creation-factor=<factor>
284
170 - Fix for a bug that makes write-tree to faile to write out a
171 - non-existent index as a tree, introduced in 2.37.
285 + Expecting a reroll.
286 + source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
287 +
288 +
289 +* js/lstat-mingw-enotdir-fix (2022-07-29) 1 commit
290 + - lstat(mingw): correctly detect ENOTDIR scenarios
291 +
292 + Fix to lstat() emulation on Windows.
293
294 Will merge to 'next'.
174 - source: <20220722212232.833188-1-martin.agren@gmail.com>
295 + source: <pull.1291.v3.git.1659089152877.gitgitgadget@gmail.com>
296 +
297 +
298 +* js/mingw-with-python (2022-07-29) 3 commits
299 + - mingw: remove unneeded `NO_CURL` directive
300 + - mingw: remove unneeded `NO_GETTEXT` directive
301 + - windows: include the Python bits when building Git for Windows
302 +
303 + Conditionally allow building Python interpreter on Windows
304 +
305 + Will merge to 'next'.
306 + source: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>
307 +
308 +
309 +* ab/submodule-helper-prep (2022-07-28) 20 commits
310 + - submodule--helper: fix bad config API usage
311 + - submodule--helper: don't exit() on failure, return
312 + - submodule--helper: add skeleton "goto cleanup" to update_submodule()
313 + - submodule--helper: rename "int res" to "int ret"
314 + - submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
315 + - submodule--helper: add "const" to copy of "update_data"
316 + - submodule--helper: pass a "const struct module_clone_data" to clone_submodule()
317 + - submodule--helper: stop conflating "sb" in clone_submodule()
318 + - submodule--helper: convert a strbuf_detach() to xstrfmt()
319 + - submodule--helper: replace memset() with { 0 }-initialization
320 + - submodule--helper style: add \n\n after variable declarations
321 + - submodule--helper style: don't separate declared variables with \n\n
322 + - submodule--helper: move "resolve-relative-url-test" to a test-tool
323 + - submodule--helper: move "check-name" to a test-tool
324 + - submodule--helper: move "is-active" to a test-tool
325 + - test-tool submodule-config: remove unused "--url" handling
326 + - submodule--helper: remove unused "list" helper
327 + - submodule--helper: remove unused "name" helper
328 + - submodule tests: test for "add <repository> <abs-path>"
329 + - submodule tests: test usage behavior
330 + (this branch is used by ab/submodule-helper-leakfix.)
331 +
332 + source: <cover-00.20-00000000000-20220728T161116Z-avarab@gmail.com>
333 +
334 +
335 +* ab/dedup-config-and-command-docs (2022-07-29) 9 commits
336 + - docs: add CONFIGURATION sections that fuzzy map to built-ins
337 + - docs: add CONFIGURATION sections that map to a built-in
338 + - log docs: de-duplicate configuration sections
339 + - difftool docs: de-duplicate configuration sections
340 + - notes docs: de-duplicate configuration sections
341 + - apply docs: de-duplicate configuration sections
342 + - send-email docs: de-duplicate configuration sections
343 + - grep docs: de-duplicate configuration sections
344 + - docs: add and use include template for config/* includes
345 +
346 + Share the text used to explain configuration variables used by "git
347 + <subcmd>" in "git help <subcmd>" with the text from "git help config".
348 +
349 + Will merge to 'next'?
350 + source: <cover-v2-0.9-00000000000-20220729T081959Z-avarab@gmail.com>
351 +
352 +
353 +* jk/struct-zero-init-with-older-gcc (2022-07-29) 1 commit
354 + - config.mak.dev: squelch -Wno-missing-braces for older gcc
355 +
356 + Older gcc with -Wall complains about the universal zero initializer
357 + "struct s = { 0 };" idiom, which makes developers' lives
358 + inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The
359 + build procedure has been tweaked to help them with thes compilers.
360 +
361 + Will merge to 'next'.
362 + source: <YuQ60ZUPBHAVETD7@coredump.intra.peff.net>
363 +
364 +
365 +* js/ort-clean-up-after-failed-merge (2022-07-29) 2 commits
366 + - merge-ort: do leave trace2 region even if checkout fails
367 + - merge-ort: clean up after failed merge
368 +
369 + Plug memory leaks in the failure code path in the "merge-ort" merge
370 + strategy backend.
371 +
372 + Will merge to 'next'?
373 + source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
374 +
375 +
376 +* js/t5351-freebsd-fix (2022-07-29) 2 commits
377 + - t5351: avoid using `test_cmp` for binary data
378 + - t5351: avoid relying on `core.fsyncMethod = batch` to be supported
379 +
380 + Some tests assumed that core.fsyncMethod=batch is supported
381 + everywhere, which broke FreeBSD.
382 +
383 + Will merge to 'next'.
384 + source: <pull.1308.git.1659097724.gitgitgadget@gmail.com>
385
386 --------------------------------------------------
387 [Stalled]
@@ -201,97 +411,98 @@ Release tarballs are available at:
411 cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
412 source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
413
414 +--------------------------------------------------
415 +[Cooking]
416
205 -* cw/remote-object-info (2022-05-06) 11 commits
206 - - SQUASH??? coccicheck
207 - - SQUASH??? ensure that coccicheck is happy
208 - - SQUASH??? compilation fix
209 - - cat-file: add --batch-command remote-object-info command
210 - - cat-file: move parse_cmd and DEFAULT_FORMAT up
211 - - transport: add object-info fallback to fetch
212 - - transport: add client side capability to request object-info
213 - - object-info: send attribute packet regardless of object ids
214 - - object-store: add function to free object_info contents
215 - - fetch-pack: move fetch default settings
417 +* cw/remote-object-info (2022-07-28) 6 commits
418 + - cat-file: add remote-object-info to batch-command
419 + - transport: add client support for object-info
420 + - serve: advertise object-info feature
421 + - protocol-caps: initialization bug fix
422 + - fetch-pack: move fetch initialization
423 - fetch-pack: refactor packet writing
424
425 A client component to talk with the object-info endpoint.
426 + source: <20220728230210.2952731-1-calvinwan@google.com>
427
220 - Expecting a reroll.
221 - source: <20220502170904.2770649-1-calvinwan@google.com>
222 -
223 ---------------------------------------------------
224 -[Cooking]
428
226 -* ds/midx-with-less-memory (2022-07-19) 3 commits
227 - (merged to 'next' on 2022-07-20 at 250d257c3e)
228 - + midx: reduce memory pressure while writing bitmaps
229 - + midx: extract bitmap write setup
230 - + pack-bitmap-write: use const for hashes
231 -
232 - The codepath to write multi-pack index has been taught to release a
233 - large chunk of memory that holds an array of objects in the packs,
234 - as soon as it is done with the array, to reduce memory consumption.
429 +* ab/leak-check (2022-07-27) 15 commits
430 + - CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks
431 + - upload-pack: fix a memory leak in create_pack_file()
432 + - leak tests: mark passing SANITIZE=leak tests as leak-free
433 + - leak tests: don't skip some tests under SANITIZE=leak
434 + - test-lib: have the "check" mode for SANITIZE=leak consider leak logs
435 + - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode
436 + - test-lib: simplify by removing test_external
437 + - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh
438 + - t/Makefile: don't remove test-results in "clean-except-prove-cache"
439 + - test-lib: add a SANITIZE=leak logging mode
440 + - t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description
441 + - test-lib: add a --invert-exit-code switch
442 + - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT
443 + - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
444 + - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_
445
236 - Will merge to 'master'.
237 - source: <pull.1292.v2.git.1658244366.gitgitgadget@gmail.com>
446 + Plugging more leaks.
447 + source: <cover-v3-00.15-00000000000-20220727T230800Z-avarab@gmail.com>
448
449
240 -* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit
241 - (merged to 'next' on 2022-07-19 at c259b61b0e)
242 - + config/core.txt: fix minor issues for `core.sparseCheckoutCone`
450 +* jc/string-list-cleanup (2022-07-20) 1 commit
451 + (merged to 'next' on 2022-07-27 at 858a0b2a28)
452 + + builtin/remote.c: use the right kind of STRING_LIST_INIT
453
244 - Docfix.
454 + Code clean-up.
455
456 Will merge to 'master'.
247 - source: <20220718100530.2068354-1-martin.agren@gmail.com>
457 + source: <xmqq7d471dns.fsf@gitster.g>
458
459
250 -* ma/t4200-update (2022-07-18) 1 commit
251 - (merged to 'next' on 2022-07-19 at 710d0cafd9)
252 - + t4200: drop irrelevant code
460 +* mt/pkt-line-comment-tweak (2022-07-22) 1 commit
461 + (merged to 'next' on 2022-07-22 at 4004fa75eb)
462 + + pkt-line.h: move comment closer to the associated code
463
254 - Test fix.
464 + In-code comment clarification.
465
466 Will merge to 'master'.
257 - source: <20220718154322.2177166-1-martin.agren@gmail.com>
467 + source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br>
468
469
260 -* mb/config-document-include (2022-07-17) 1 commit
261 - (merged to 'next' on 2022-07-19 at 8267b80aa2)
262 - + config.txt: document include, includeIf
470 +* mt/rot13-in-c (2022-07-24) 2 commits
471 + - t/t0021: convert the rot13-filter.pl script to C
472 + - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
473 + (this branch uses mt/checkout-count-fix.)
474
264 - Add missing documentation for "include" and "includeIf" features in
265 - "git config" file format, which incidentally teachs the command
266 - line completion to include them in its offerings.
475 + Test portability improvements.
476
268 - Will merge to 'master'.
269 - source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com>
477 + Needs review.
478 + source: <f38f722de7c3323207eda5ea632b5acd3765c285.1658675222.git.matheus.bernardino@usp.br>
479
480
272 -* sg/index-format-doc-update (2022-07-18) 1 commit
273 - (merged to 'next' on 2022-07-19 at ccc384be5e)
274 - + index-format.txt: remove outdated list of supported extensions
481 +* tk/untracked-cache-with-uall (2022-07-22) 1 commit
482 + (merged to 'next' on 2022-07-25 at b792dd5012)
483 + + read-cache: make `do_read_index()` always set up `istate->repo`
484
276 - Docfix.
485 + Fix for a bug that makes write-tree to fail to write out a
486 + non-existent index as a tree, introduced in 2.37.
487
488 Will merge to 'master'.
279 - source: <20220718085640.7395-1-szeder.dev@gmail.com>
489 + source: <20220722212232.833188-1-martin.agren@gmail.com>
490
491
282 -* tl/pack-bitmap-error-messages (2022-07-18) 6 commits
283 - (merged to 'next' on 2022-07-19 at 3f9565653a)
284 - + pack-bitmap.c: continue looping when first MIDX bitmap is found
285 - + pack-bitmap.c: using error() instead of silently returning -1
286 - + pack-bitmap.c: do not ignore error when opening a bitmap file
287 - + pack-bitmap.c: rename "idx_name" to "bitmap_name"
288 - + pack-bitmap.c: mark more strings for translations
289 - + pack-bitmap.c: fix formatting of error messages
492 +* ds/midx-with-less-memory (2022-07-27) 4 commits
493 + (merged to 'next' on 2022-07-27 at 9ac7aed9f6)
494 + + write_midx_bitmap(): drop unused refs_snapshot parameter
495 + (merged to 'next' on 2022-07-20 at 250d257c3e)
496 + + midx: reduce memory pressure while writing bitmaps
497 + + midx: extract bitmap write setup
498 + + pack-bitmap-write: use const for hashes
499
291 - Tweak various messages that come from the pack-bitmap codepaths.
500 + The codepath to write multi-pack index has been taught to release a
501 + large chunk of memory that holds an array of objects in the packs,
502 + as soon as it is done with the array, to reduce memory consumption.
503
504 Will merge to 'master'.
294 - source: <cover.1658159745.git.dyroneteng@gmail.com>
505 + source: <pull.1292.v2.git.1658244366.gitgitgadget@gmail.com>
506
507
508 * tl/trace2-config-scope (2022-07-22) 2 commits
@@ -300,21 +511,11 @@ Release tarballs are available at:
511
512 Tweak trace2 output about configuration variables.
513
303 - Will merge to 'next'?
514 + Expecting a reroll.
515 + cf. <220722.86fsits91m.gmgdl@evledraar.gmail.com>
516 source: <cover.1658472474.git.dyroneteng@gmail.com>
517
518
307 -* vd/scalar-doc (2022-07-18) 2 commits
308 - (merged to 'next' on 2022-07-20 at fab0234da4)
309 - + scalar: convert README.md into a technical design doc
310 - + scalar: reword command documentation to clarify purpose
311 -
312 - Doc update.
313 -
314 - Will merge to 'master'.
315 - source: <pull.1275.v2.git.1657584367.gitgitgadget@gmail.com>
316 -
317 -
519 * cl/rerere-train-with-no-sign (2022-07-19) 1 commit
520 (merged to 'next' on 2022-07-20 at fbb9414d09)
521 + contrib/rerere-train: avoid useless gpg sign in training
@@ -326,83 +527,42 @@ Release tarballs are available at:
527 source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
528
529
329 -* ds/win-syslog-compiler-fix (2022-07-19) 1 commit
330 - (merged to 'next' on 2022-07-20 at d38b649b18)
331 - + compat/win32: correct for incorrect compiler warning
332 -
333 - Workaround for a false positive compiler warning.
334 -
335 - Will merge to 'master'.
336 - source: <pull.1294.git.1658256354725.gitgitgadget@gmail.com>
337 -
338 -
339 -* ld/osx-keychain-usage-fix (2022-07-19) 1 commit
340 - (merged to 'next' on 2022-07-20 at eebd316ef6)
341 - + osx-keychain: fix compiler warning
342 -
343 - Workaround for a compiler warning against use of die() in
344 - osx-keychain (in contrib/).
345 -
346 - Will merge to 'master'.
347 - source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com>
348 -
349 -
350 -* ab/submodule-helper-leakfix (2022-07-21) 26 commits
530 +* ab/submodule-helper-leakfix (2022-07-28) 18 commits
531 - submodule--helper: fix a configure_added_submodule() leak
352 - - submodule--helper: fix bad config API usage
532 - submodule--helper: free rest of "displaypath" in "struct update_data"
354 - - submodule--helper: don't exit() on failure, return
355 - - submodule--helper: add skeleton "goto cleanup" to update_submodule()
356 - - submodule--helper: rename "int res" to "int ret"
533 - submodule--helper: free some "displaypath" in "struct update_data"
534 - submodule--helper: fix a memory leak in print_status()
535 - submodule--helper: fix a leak in module_add()
536 - submodule--helper: fix obscure leak in module_add()
361 - - submodule--helper: fix "reference" leak is "module_clone_data"
537 + - submodule--helper: fix "reference" leak
538 - submodule--helper: fix a memory leak in get_default_remote_submodule()
539 - submodule--helper: fix a leak with repo_clear()
540 - submodule--helper: fix "sm_path" and other "module_cb_list" leaks
541 - submodule--helper: fix "errmsg_str" memory leak
366 - - submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
542 - submodule--helper: add and use *_release() functions
368 - - submodule--helper: add "const" to copy of "update_data"
543 - submodule--helper: don't leak {run,capture}_command() cp.dir argument
544 - submodule--helper: "struct pathspec" memory leak in module_update()
545 - submodule--helper: fix most "struct pathspec" memory leaks
546 - submodule--helper: fix trivial get_default_remote_submodule() leak
547 - submodule--helper: fix a leak in "clone_submodule"
374 - - submodule--helper: pass a "const struct module_clone_data" to clone_submodule()
375 - - submodule--helper: stop conflating "sb" in clone_submodule()
376 - - submodule--helper: replace memset() with { 0 }-initialization
548 + - Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix
549 + (this branch uses ab/submodule-helper-prep.)
550
551 Plugging leaks in submodule--helper.
552
553 Getting there.
381 - source: <cover-v3-00.26-00000000000-20220721T191249Z-avarab@gmail.com>
382 -
383 -
384 -* mt/doc-config (2022-07-14) 3 commits
385 - - doc: notes: unify configuration variables definitions
386 - - doc: apply: unify configuration variables definitions
387 - - doc: grep: unify configuration variables definitions
388 -
389 - Unify description of configuration variables used by individual
390 - commands in the documentation of the commands and the documentation
391 - of the "git config".
392 -
393 - Will discard (Retracted?).
394 - cf. <CAHd-oW4zHA1YLX-5B1vYTA1f8PocziUCi0WxvSEkFUuf2GqKxg@mail.gmail.com>
395 - source: <cover.1657819649.git.matheus.bernardino@usp.br>
554 + source: <cover-v4-00.17-00000000000-20220728T162442Z-avarab@gmail.com>
555
556
398 -* jt/fetch-pack-trace2-filter-spec (2022-07-18) 1 commit
399 - - fetch-pack: write effective filter to trace2
557 +* jt/fetch-pack-trace2-filter-spec (2022-07-26) 1 commit
558 + (merged to 'next' on 2022-07-28 at 8e6237d6b0)
559 + + fetch-pack: write effective filter to trace2
560
561 "git fetch" client logs the partial clone filter used in the trace2
562 output.
563
404 - Will merge to 'next'?
405 - source: <20220718170027.3993042-1-jonathantanmy@google.com>
564 + Will merge to 'master'.
565 + source: <20220726162712.1774355-1-jonathantanmy@google.com>
566
567
568 * mb/doc-rerere-autoupdate (2022-07-15) 1 commit
@@ -411,50 +571,36 @@ Release tarballs are available at:
571 Clarifies that the "--no-rerere-autoupdate" option does not disable
572 the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).
573
414 - Will merge to 'next'?
574 + Needs updating, at least for other commands with the same option.
575 + cf. <xmqq35f2ysd9.fsf@gitster.g>
576 source: <20220715092527.1567837-1-mail@beyermatthias.de>
577
578
579 * rs/mergesort (2022-07-17) 10 commits
419 - - mergesort: remove llist_mergesort()
420 - - packfile: use DEFINE_LIST_SORT
421 - - fetch-pack: use DEFINE_LIST_SORT
422 - - commit: use DEFINE_LIST_SORT
423 - - blame: use DEFINE_LIST_SORT
424 - - test-mergesort: use DEFINE_LIST_SORT
425 - - test-mergesort: use DEFINE_LIST_SORT_DEBUG
426 - - mergesort: add macros for typed sort of linked lists
427 - - mergesort: tighten merge loop
428 - - mergesort: unify ranks loops
580 + (merged to 'next' on 2022-07-27 at 42607a44bb)
581 + + mergesort: remove llist_mergesort()
582 + + packfile: use DEFINE_LIST_SORT
583 + + fetch-pack: use DEFINE_LIST_SORT
584 + + commit: use DEFINE_LIST_SORT
585 + + blame: use DEFINE_LIST_SORT
586 + + test-mergesort: use DEFINE_LIST_SORT
587 + + test-mergesort: use DEFINE_LIST_SORT_DEBUG
588 + + mergesort: add macros for typed sort of linked lists
589 + + mergesort: tighten merge loop
590 + + mergesort: unify ranks loops
591
592 Make our mergesort implementation type-safe.
593
432 - Will merge to 'next'?
594 + Will merge to 'master'.
595 source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>
596
597
436 -* cw/submodule-merge-messages (2022-07-18) 1 commit
598 +* cw/submodule-merge-messages (2022-07-28) 1 commit
599 - submodule merge: update conflict error message
600
601 Update the message given when "git merge" sees conflicts at a path
602 with a submodule while merging a superproject.
441 -
442 - Needs review.
443 - source: <20220718214349.3379328-1-calvinwan@google.com>
444 -
445 -
446 -* ds/doc-wo-whitelist (2022-07-19) 5 commits
447 - (merged to 'next' on 2022-07-20 at ec51c6269a)
448 - + transport.c: avoid "whitelist"
449 - + t: avoid "whitelist"
450 - + git.txt: remove redundant language
451 - + git-cvsserver: clarify directory list
452 - + daemon: clarify directory arguments
453 -
454 - Avoid "white/black-list" in documentation and code comments.
455 -
456 - Will merge to 'master'.
457 - source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com>
603 + source: <20220728211221.2913928-1-calvinwan@google.com>
604
605
606 * mt/checkout-count-fix (2022-07-14) 3 commits
@@ -472,14 +618,15 @@ Release tarballs are available at:
618
619
620 * tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits
475 - - commit-graph: fix corrupt upgrade from generation v1 to v2
476 - - commit-graph: introduce `repo_find_commit_pos_in_graph()`
477 - - t5318: demonstrate commit-graph generation v2 corruption
621 + (merged to 'next' on 2022-07-25 at e3464c2c1d)
622 + + commit-graph: fix corrupt upgrade from generation v1 to v2
623 + + commit-graph: introduce `repo_find_commit_pos_in_graph()`
624 + + t5318: demonstrate commit-graph generation v2 corruption
625
626 There was a bug in the codepath to upgrade generation information
627 in commit-graph from v1 to v2 format, which has been corrected.
628
482 - Will merge to 'next'?
629 + Will merge to 'master'.
630 source: <cover.1657667404.git.me@ttaylorr.com>
631
632
@@ -488,7 +635,8 @@ Release tarballs are available at:
635 - mingw: handle a file owned by the Administrators group correctly
636 - Allow debugging unsafe directories' ownership
637
491 - Needs review.
638 + Expecting a reroll.
639 + cf. <8rqqnqp1-q613-ron6-6q8s-n7sq57o980q9@tzk.qr>
640 source: <pull.1286.git.1657700238.gitgitgadget@gmail.com>
641
642
@@ -526,9 +674,9 @@ Release tarballs are available at:
674 The pack bitmap file gained a bitmap-lookup table to speed up
675 locating the necessary bitmap for a given commit.
676
529 - Waiting for a more thorough review.
530 - cf. <Ys4DjW9JjQFx5Bhb@nand.local>
531 - source: <pull.1266.v4.git.1658325913.gitgitgadget@gmail.com>
677 + Seems to be flaky-broken under SHA-256.
678 + cf. <p3r70610-8n52-s8q0-n641-onp4ps01330n@tzk.qr>
679 + source: <pull.1266.v5.git.1658342304.gitgitgadget@gmail.com>
680
681
682 * kk/p4-client-name-encoding-fix (2022-07-21) 2 commits
@@ -545,15 +693,16 @@ Release tarballs are available at:
693
694
695 * sa/cat-file-mailmap (2022-07-18) 4 commits
548 - - cat-file: add mailmap support
549 - - ident: rename commit_rewrite_person() to apply_mailmap_to_header()
550 - - ident: move commit_rewrite_person() to ident.c
551 - - revision: improve commit_rewrite_person()
696 + (merged to 'next' on 2022-07-27 at 59c4eb32b3)
697 + + cat-file: add mailmap support
698 + + ident: rename commit_rewrite_person() to apply_mailmap_to_header()
699 + + ident: move commit_rewrite_person() to ident.c
700 + + revision: improve commit_rewrite_person()
701
702 "git cat-file" learned an option to use the mailmap when showing
703 commit and tag objects.
704
556 - Will merge to 'next'?
705 + Will merge to 'master'.
706 source: <20220718195102.66321-1-siddharthasthana31@gmail.com>
707
708
@@ -581,62 +730,46 @@ Release tarballs are available at:
730
731
732 * pw/xdiff-alloc (2022-07-08) 4 commits
584 - - xdiff: introduce XDL_ALLOC_GROW()
585 - - xdiff: introduce XDL_CALLOC_ARRAY()
586 - - xdiff: introduce xdl_calloc
587 - - xdiff: introduce XDL_ALLOC_ARRAY()
733 + (merged to 'next' on 2022-07-25 at 92a39a5ff2)
734 + + xdiff: introduce XDL_ALLOC_GROW()
735 + + xdiff: introduce XDL_CALLOC_ARRAY()
736 + + xdiff: introduce xdl_calloc
737 + + xdiff: introduce XDL_ALLOC_ARRAY()
738
739 Add a level of redirection to array allocation API in xdiff part,
740 to make it easier to share with the libgit2 project.
741
592 - Will merge to 'next'?
593 - source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
594 -
595 -
596 -* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit
597 - (merged to 'next' on 2022-07-19 at f77cd40c29)
598 - + trace2: only include "fsync" events if we git_fsync()
599 -
600 - Omit fsync-related trace2 entries when their values are all zero.
601 -
742 Will merge to 'master'.
603 - source: <patch-v3-1.1-979dea5956a-20220718T102747Z-avarab@gmail.com>
743 + source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
744
745
606 -* en/merge-restore-to-pristine (2022-07-21) 7 commits
607 - - merge: do not exit restore_state() prematurely
608 - - merge: ensure we can actually restore pre-merge state
609 - - merge: make restore_state() restore staged state too
610 - - merge: fix save_state() to work when there are stat-dirty files
611 - - merge: do not abort early if one strategy fails to handle the merge
612 - - merge-resolve: abort if index does not match HEAD
613 - - merge-ort-wrappers: make printed message match the one from recursive
746 +* en/merge-restore-to-pristine (2022-07-22) 8 commits
747 + (merged to 'next' on 2022-07-27 at daafc50c15)
748 + + merge: do not exit restore_state() prematurely
749 + + merge: ensure we can actually restore pre-merge state
750 + + merge: make restore_state() restore staged state too
751 + + merge: fix save_state() to work when there are stat-dirty files
752 + + merge: do not abort early if one strategy fails to handle the merge
753 + + merge: abort if index does not match HEAD for trivial merges
754 + + merge-resolve: abort if index does not match HEAD
755 + + merge-ort-wrappers: make printed message match the one from recursive
756
757 When "git merge" finds that it cannot perform a merge, it should
758 restore the working tree to the state before the command was
759 initiated, but in some corner cases it didn't.
760
619 - Will merge to 'next'?
620 - source: <pull.1231.v3.git.1658391391.gitgitgadget@gmail.com>
761 + Will merge to 'master'.
762 + source: <pull.1231.v5.git.1658541198.gitgitgadget@gmail.com>
763
764
623 -* zh/ls-files-format (2022-07-20) 1 commit
624 - - ls-files: introduce "--format" option
765 +* zh/ls-files-format (2022-07-23) 1 commit
766 + (merged to 'next' on 2022-07-27 at b7301f16ce)
767 + + ls-files: introduce "--format" option
768
769 "git ls-files" learns the "--format" option to tweak its output.
770
628 - Will merge to 'next'?
629 - source: <pull.1262.v8.git.1658334983053.gitgitgadget@gmail.com>
630 -
631 -
632 -* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit
633 - (merged to 'next' on 2022-07-19 at bcc29d823d)
634 - + commit-graph: pass repo_settings instead of repository
635 -
636 - API tweak to make it easier to run fuzz testing on commit-graph parser.
637 -
771 Will merge to 'master'.
639 - source: <fd70b6119153b165a62ee4f693dbe47031cfb2be.1657834657.git.steadmon@google.com>
772 + source: <pull.1262.v9.git.1658558685407.gitgitgadget@gmail.com>
773
774
775 * jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
@@ -664,18 +797,14 @@ Release tarballs are available at:
797 source: <cover.1654552560.git.me@ttaylorr.com>
798
799
667 -* ds/bundle-uri-more (2022-06-06) 6 commits
668 - - fetch: add 'refs/bundle/' to log.excludeDecoration
669 - - bundle-uri: add support for http(s):// and file://
670 - - fetch: add --bundle-uri option
671 - - bundle-uri: create basic file-copy logic
672 - - remote-curl: add 'get' capability
800 +* ds/bundle-uri-more (2022-07-25) 2 commits
801 + - bundle-uri: add example bundle organization
802 - docs: document bundle URI standard
803
804 The "bundle URI" topic.
805
806 Needs review.
678 - source: <pull.1248.git.1654545325.gitgitgadget@gmail.com>
807 + source: <pull.1248.v3.git.1658757188.gitgitgadget@gmail.com>
808
809
810 * js/bisect-in-c (2022-06-27) 16 commits
@@ -716,3 +845,17 @@ Release tarballs are available at:
845 myself for daily work, but the prompting turned out to be somewhat
846 distracting.
847 source: <20220422083629.1404989-1-hi@alyssa.is>
848 +
849 +
850 +* mt/doc-config (2022-07-14) 3 commits
851 + . doc: notes: unify configuration variables definitions
852 + . doc: apply: unify configuration variables definitions
853 + . doc: grep: unify configuration variables definitions
854 +
855 + Unify description of configuration variables used by individual
856 + commands in the documentation of the commands and the documentation
857 + of the "git config".
858 +
859 + Retracted.
860 + cf. <20220723134834.9693-1-matheus.bernardino@usp.br>
861 + source: <cover.1657819649.git.matheus.bernardino@usp.br>