What's cooking (2022/08 #03)

Junio C Hamano committed Aug 8, 2022 at 13:33 UTC b69178c0ab22841859339d3b5d8ebd3a35a8e57e
1 file changed +167 -248
whats-cooking.txt
+167 -248
@@ -1,9 +1,9 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Aug 2022, #02; Fri, 5)
3 -X-master-at: 679aad9e82d0dfd8ef3d1f98fa4629665496cec9
4 -X-next-at: 8b5581f2bb185e8784b9bfb4e62049927bff10d8
2 +Subject: What's cooking in git.git (Aug 2022, #03; Mon, 8)
3 +X-master-at: c50926e1f48891e2671e1830dbcd2912a4563450
4 +X-next-at: c1821dd516c3fe71ff8009bcb7fca5764e49a4b9
5
6 -What's cooking in git.git (Aug 2022, #02; Fri, 5)
6 +What's cooking in git.git (Aug 2022, #03; Mon, 8)
7 --------------------------------------------------
8
9 Here are the topics that have been cooking in my tree. Commits
@@ -13,8 +13,8 @@ future release). Commits prefixed with '-' are only in 'seen',
13 and aren't considered "accepted" at all.
14
15 A handful of topics have graduated to the 'master' track, and half a
16 -dozen topics are now in 'next' to cook. We are at the end of Week
17 -#4 of a 12-week cycle (cf. https://tinyurl.com/gitCal).
16 +dozen topics are now in 'next' to cook. We are starting the week #5
17 +of a 12-week cycle (cf. https://tinyurl.com/gitCal).
18
19 Copies of the source code to Git live in many repositories, and the
20 following is a list of the ones I push into or their mirrors. Some
@@ -47,152 +47,139 @@ Release tarballs are available at:
47 --------------------------------------------------
48 [Graduated to 'master']
49
50 -* ds/midx-with-less-memory (2022-07-27) 4 commits
51 - (merged to 'next' on 2022-07-27 at 9ac7aed9f6)
52 - + write_midx_bitmap(): drop unused refs_snapshot parameter
53 - (merged to 'next' on 2022-07-20 at 250d257c3e)
54 - + midx: reduce memory pressure while writing bitmaps
55 - + midx: extract bitmap write setup
56 - + pack-bitmap-write: use const for hashes
57 -
58 - The codepath to write multi-pack index has been taught to release a
59 - large chunk of memory that holds an array of objects in the packs,
60 - as soon as it is done with the array, to reduce memory consumption.
61 - source: <pull.1292.v2.git.1658244366.gitgitgadget@gmail.com>
62 -
50 +* ca/unignore-local-installation-on-windows (2022-07-27) 1 commit
51 + (merged to 'next' on 2022-08-01 at 1d4f4c32a6)
52 + + cmake: support local installations of git
53
64 -* en/merge-restore-to-pristine (2022-07-22) 8 commits
65 - (merged to 'next' on 2022-07-27 at daafc50c15)
66 - + merge: do not exit restore_state() prematurely
67 - + merge: ensure we can actually restore pre-merge state
68 - + merge: make restore_state() restore staged state too
69 - + merge: fix save_state() to work when there are stat-dirty files
70 - + merge: do not abort early if one strategy fails to handle the merge
71 - + merge: abort if index does not match HEAD for trivial merges
72 - + merge-resolve: abort if index does not match HEAD
73 - + merge-ort-wrappers: make printed message match the one from recursive
54 + Fix build procedure for Windows that uses CMake so that it can pick
55 + up the shell interpreter from local installation location.
56 + source: <pull.1304.git.1658912756815.gitgitgadget@gmail.com>
57
75 - When "git merge" finds that it cannot perform a merge, it should
76 - restore the working tree to the state before the command was
77 - initiated, but in some corner cases it didn't.
78 - source: <pull.1231.v5.git.1658541198.gitgitgadget@gmail.com>
58
59 +* jk/struct-zero-init-with-older-gcc (2022-07-31) 1 commit
60 + (merged to 'next' on 2022-08-01 at cde4f95964)
61 + + config.mak.dev: squelch -Wno-missing-braces for older gcc
62
81 -* gc/bare-repo-discovery (2022-07-26) 1 commit
82 - (merged to 'next' on 2022-07-28 at 1d2bef98f6)
83 - + config.c: NULL check when reading protected config
63 + Older gcc with -Wall complains about the universal zero initializer
64 + "struct s = { 0 };" idiom, which makes developers' lives
65 + inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The
66 + build procedure has been tweaked to help these compilers.
67 + source: <YuQ60ZUPBHAVETD7@coredump.intra.peff.net>
68
85 - Fix-up for what has been merged to 'master' recently.
86 - source: <pull.1299.v2.git.git.1658874067077.gitgitgadget@gmail.com>
69
70 +* js/lstat-mingw-enotdir-fix (2022-07-29) 1 commit
71 + (merged to 'next' on 2022-08-01 at 10499943b7)
72 + + lstat(mingw): correctly detect ENOTDIR scenarios
73
89 -* jc/string-list-cleanup (2022-07-20) 1 commit
90 - (merged to 'next' on 2022-07-27 at 858a0b2a28)
91 - + builtin/remote.c: use the right kind of STRING_LIST_INIT
74 + Fix to lstat() emulation on Windows.
75 + source: <pull.1291.v3.git.1659089152877.gitgitgadget@gmail.com>
76
93 - Code clean-up.
94 - source: <xmqq7d471dns.fsf@gitster.g>
77
78 +* js/mingw-with-python (2022-07-29) 3 commits
79 + (merged to 'next' on 2022-08-01 at 73b8f06182)
80 + + mingw: remove unneeded `NO_CURL` directive
81 + + mingw: remove unneeded `NO_GETTEXT` directive
82 + + windows: include the Python bits when building Git for Windows
83
97 -* jr/gitweb-title-shortening (2022-07-26) 1 commit
98 - (merged to 'next' on 2022-07-28 at 7528e87220)
99 - + gitweb: remove title shortening heuristics
84 + Conditionally allow building Python interpreter on Windows
85 + source: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>
86
101 - Gitweb had legacy URL shortener that is specific to the way
102 - projects hosted on kernel.org used to (but no longer) work, which
103 - has been removed.
104 - source: <20220726135911.ycvgwbkixb3ei6w3@jrouhaud>
87
88 +* js/ort-clean-up-after-failed-merge (2022-07-31) 2 commits
89 + (merged to 'next' on 2022-08-01 at 0c9f02f3ec)
90 + + merge-ort: do leave trace2 region even if checkout fails
91 + + merge-ort: clean up after failed merge
92
107 -* jt/fetch-pack-trace2-filter-spec (2022-07-26) 1 commit
108 - (merged to 'next' on 2022-07-28 at 8e6237d6b0)
109 - + fetch-pack: write effective filter to trace2
93 + Plug memory leaks in the failure code path in the "merge-ort" merge
94 + strategy backend.
95 + source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
96
111 - "git fetch" client logs the partial clone filter used in the trace2
112 - output.
113 - source: <20220726162712.1774355-1-jonathantanmy@google.com>
97
98 +* js/t5351-freebsd-fix (2022-07-29) 2 commits
99 + (merged to 'next' on 2022-08-01 at b47609e891)
100 + + t5351: avoid using `test_cmp` for binary data
101 + + t5351: avoid relying on `core.fsyncMethod = batch` to be supported
102
116 -* pw/xdiff-alloc (2022-07-08) 4 commits
117 - (merged to 'next' on 2022-07-25 at 92a39a5ff2)
118 - + xdiff: introduce XDL_ALLOC_GROW()
119 - + xdiff: introduce XDL_CALLOC_ARRAY()
120 - + xdiff: introduce xdl_calloc
121 - + xdiff: introduce XDL_ALLOC_ARRAY()
103 + Some tests assumed that core.fsyncMethod=batch is supported
104 + everywhere, which broke FreeBSD.
105 + source: <pull.1308.git.1659097724.gitgitgadget@gmail.com>
106
123 - Add a level of redirection to array allocation API in xdiff part,
124 - to make it easier to share with the libgit2 project.
125 - source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
107 +--------------------------------------------------
108 +[New Topics]
109
110 +* sy/mv-into-cone (2022-08-05) 9 commits
111 + - mv: check overwrite for in-to-out move
112 + - advice.h: add advise_on_moving_dirty_path()
113 + - mv: cleanup empty WORKING_DIRECTORY
114 + - mv: from in-cone to out-of-cone
115 + - mv: remove BOTH from enum update_mode
116 + - mv: check if <destination> is a SKIP_WORKTREE_DIR
117 + - mv: free the *with_slash in check_dir_in_index()
118 + - mv: rename check_dir_in_index() to empty_dir_has_sparse_contents()
119 + - t7002: add tests for moving from in-cone to out-of-cone
120 +
121 + "git mv A B" in a sparsely populated working tree can be asked to
122 + move a path from a directory that is "in cone" to another directory
123 + that is "out of cone". Handling of such a case has been improved.
124
128 -* rs/mergesort (2022-07-17) 10 commits
129 - (merged to 'next' on 2022-07-27 at 42607a44bb)
130 - + mergesort: remove llist_mergesort()
131 - + packfile: use DEFINE_LIST_SORT
132 - + fetch-pack: use DEFINE_LIST_SORT
133 - + commit: use DEFINE_LIST_SORT
134 - + blame: use DEFINE_LIST_SORT
135 - + test-mergesort: use DEFINE_LIST_SORT
136 - + test-mergesort: use DEFINE_LIST_SORT_DEBUG
137 - + mergesort: add macros for typed sort of linked lists
138 - + mergesort: tighten merge loop
139 - + mergesort: unify ranks loops
125 + Will merge to 'next'?
126 + source: <20220805030528.1535376-1-shaoxuan.yuan02@gmail.com>
127
141 - Make our mergesort implementation type-safe.
142 - source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>
128
129 +* fr/vimdiff-layout-colors-fix (2022-08-07) 3 commits
130 + - mergetools: vimdiff: update unit tests
131 + - mergetools: vimdiff: fix single tab mode, single window mode and colors
132 + - mergetools: vimdiff: fix comment
133
145 -* sa/cat-file-mailmap (2022-07-18) 4 commits
146 - (merged to 'next' on 2022-07-27 at 59c4eb32b3)
147 - + cat-file: add mailmap support
148 - + ident: rename commit_rewrite_person() to apply_mailmap_to_header()
149 - + ident: move commit_rewrite_person() to ident.c
150 - + revision: improve commit_rewrite_person()
134 + "vimdiff3" regression fix.
135
152 - "git cat-file" learned an option to use the mailmap when showing
153 - commit and tag objects.
154 - source: <20220718195102.66321-1-siddharthasthana31@gmail.com>
136 + Will merge to 'next'?
137 + source: <20220808053459.184367-1-greenfoo@u92.eu>
138
139
157 -* tb/cat-file-z (2022-07-22) 2 commits
158 - (merged to 'next' on 2022-07-28 at 78731f0fdb)
159 - + builtin/cat-file.c: support NUL-delimited input with `-z`
160 - + t1006: extract --batch-command inputs to variables
140 +* sy/sparse-rm (2022-08-08) 5 commits
141 + - rm: integrate with sparse-index
142 + - rm: expand the index only when necessary
143 + - pathspec.h: move pathspec_needs_expanded_index() from reset.c to here
144 + - t1092: add tests for `git-rm`
145 + - Merge branch 'vd/sparse-reset-checkout-fixes' into sy/sparse-rm
146 + (this branch uses vd/sparse-reset-checkout-fixes.)
147
162 - Operating modes like "--batch" of "git cat-file" command learned to
163 - take NUL-terminated input, instead of one-item-per-line.
164 - source: <cover.1658532524.git.me@ttaylorr.com>
148 + "git rm" has become more aware of the sparse-index feature.
149
150 + Will merge to 'next'?
151 + source: <20220807041335.1790658-1-shaoxuan.yuan02@gmail.com>
152
167 -* tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits
168 - (merged to 'next' on 2022-07-25 at e3464c2c1d)
169 - + commit-graph: fix corrupt upgrade from generation v1 to v2
170 - + commit-graph: introduce `repo_find_commit_pos_in_graph()`
171 - + t5318: demonstrate commit-graph generation v2 corruption
153 +--------------------------------------------------
154 +[Stalled]
155
173 - There was a bug in the codepath to upgrade generation information
174 - in commit-graph from v1 to v2 format, which has been corrected.
175 - source: <cover.1657667404.git.me@ttaylorr.com>
156 +* tk/apply-case-insensitive (2022-06-21) 3 commits
157 + - apply: support case-only renames in case-insensitive filesystems
158 + - reset: new failing test for reset of case-insensitive duplicate in index
159 + - t4141: test "git apply" with core.ignorecase
160
161 + "git apply" barfed on a patch that makes a case-only rename on a
162 + case-insensitive filesystem.
163
178 -* tk/untracked-cache-with-uall (2022-07-22) 1 commit
179 - (merged to 'next' on 2022-07-25 at b792dd5012)
180 - + read-cache: make `do_read_index()` always set up `istate->repo`
164 + Needs review.
165 + source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
166
182 - Fix for a bug that makes write-tree to fail to write out a
183 - non-existent index as a tree, introduced in 2.37.
184 - source: <20220722212232.833188-1-martin.agren@gmail.com>
167
168 +* bc/stash-export (2022-04-08) 4 commits
169 + - builtin/stash: provide a way to import stashes from a ref
170 + - builtin/stash: provide a way to export stashes to a ref
171 + - builtin/stash: factor out revision parsing into a function
172 + - object-name: make get_oid quietly return an error
173
187 -* zh/ls-files-format (2022-07-23) 1 commit
188 - (merged to 'next' on 2022-07-27 at b7301f16ce)
189 - + ls-files: introduce "--format" option
174 + A mechanism to export and import stash entries to and from a normal
175 + commit to transfer it across repositories has been introduced.
176
191 - "git ls-files" learns the "--format" option to tweak its output.
192 - source: <pull.1262.v9.git.1658558685407.gitgitgadget@gmail.com>
177 + Expecting a reroll.
178 + cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
179 + source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
180
181 --------------------------------------------------
195 -[New Topics]
182 +[Cooking]
183
184 * lt/symbolic-ref-sanity (2022-08-01) 1 commit
185 (merged to 'next' on 2022-08-03 at 443647b94a)
@@ -219,6 +206,8 @@ Release tarballs are available at:
206 The "diagnose" feature to create a zip archive for diagnostic
207 material has been lifted from "scalar" and made into a feature of
208 "git bugreport".
209 +
210 + Expecting responses to reviews.
211 source: <pull.1310.v2.git.1659577543.gitgitgadget@gmail.com>
212
213
@@ -261,12 +250,13 @@ Release tarballs are available at:
250
251
252 * jc/rerere-autoupdate-doc (2022-08-03) 2 commits
264 - - doc: clarify rerere-autoupdate
265 - - doc: consolidate --rerere-autoupdate description
253 + (merged to 'next' on 2022-08-08 at 6407091d13)
254 + + doc: clarify rerere-autoupdate
255 + + doc: consolidate --rerere-autoupdate description
256
257 Update documentation on the "--[no-]rerere-autoupdate" option.
258
269 - Will merge to 'next'.
259 + Will merge to 'master'.
260 source: <xmqq35f2ysd9.fsf@gitster.g>
261
262
@@ -284,85 +274,58 @@ Release tarballs are available at:
274
275
276 * pw/use-glibc-tunable-for-malloc-optim (2022-08-04) 1 commit
287 - - tests: cache glibc version check
277 + (merged to 'next' on 2022-08-08 at 1300f84dc4)
278 + + tests: cache glibc version check
279
280 Avoid repeatedly running getconf to ask libc version in the test
281 suite, and instead just as it once per script.
282
292 - Will merge to 'next'?
283 + Will merge to 'master'.
284 source: <pull.1311.git.1659620305757.gitgitgadget@gmail.com>
285
286
296 -* vd/sparse-reset-checkout-fixes (2022-08-04) 4 commits
297 - - unpack-trees: handle missing sparse directories
298 - - cache.h: replace 'index_entry_exists()' with 'index_name_pos_sparse()'
287 +* vd/sparse-reset-checkout-fixes (2022-08-08) 4 commits
288 + - unpack-trees: unpack new trees as sparse directories
289 + - cache.h: create 'index_name_pos_sparse()'
290 - oneway_diff: handle removed sparse directories
291 - checkout: fix nested sparse directory diff in sparse index
292 + (this branch is used by sy/sparse-rm.)
293
294 Fixes to sparse index compatibility work for "reset" and "checkout"
295 commands.
296
305 - Expecting a reroll to further clarify [4/4].
306 - cf. <3825ef9a-4c71-21ed-6452-bbd322ca839c@github.com>
307 - source: <pull.1312.git.1659645967.gitgitgadget@gmail.com>
297 + Will merge to 'next'?
298 + source: <pull.1312.v3.git.1659985672.gitgitgadget@gmail.com>
299
300
301 * ab/hooks-regression-fix (2022-08-05) 1 commit
311 - - hook API: don't segfault on strbuf_addf() to NULL "out"
302 + (merged to 'next' on 2022-08-08 at f5a3f88983)
303 + + hook API: don't segfault on strbuf_addf() to NULL "out"
304
305 A follow-up fix to a fix for a regression in 2.36.
306
315 - Will merge to 'next' and then to 'master'.
307 + Will merge to 'master' and then to 'maint'.
308 source: <patch-1.1-2450e3e65cf-20220805T141402Z-avarab@gmail.com>
309
318 ---------------------------------------------------
319 -[Stalled]
320 -
321 -* tk/apply-case-insensitive (2022-06-21) 3 commits
322 - - apply: support case-only renames in case-insensitive filesystems
323 - - reset: new failing test for reset of case-insensitive duplicate in index
324 - - t4141: test "git apply" with core.ignorecase
325 -
326 - "git apply" barfed on a patch that makes a case-only rename on a
327 - case-insensitive filesystem.
328 -
329 - Needs review.
330 - source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
331 -
332 -
333 -* bc/stash-export (2022-04-08) 4 commits
334 - - builtin/stash: provide a way to import stashes from a ref
335 - - builtin/stash: provide a way to export stashes to a ref
336 - - builtin/stash: factor out revision parsing into a function
337 - - object-name: make get_oid quietly return an error
338 -
339 - A mechanism to export and import stash entries to and from a normal
340 - commit to transfer it across repositories has been introduced.
341 -
342 - Expecting a reroll.
343 - cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
344 - source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
345 -
346 ---------------------------------------------------
347 -[Cooking]
310
311 * ab/tech-docs-to-help (2022-08-04) 12 commits
350 - - docs: move http-protocol docs to man section 5
351 - - docs: move cruft pack docs to gitformat-pack
352 - - docs: move pack format docs to man section 5
353 - - docs: move signature docs to man section 5
354 - - docs: move index format docs to man section 5
355 - - docs: move protocol-related docs to man section 5
356 - - docs: move commit-graph format docs to man section 5
357 - - git docs: add a category for file formats, protocols and interfaces
358 - - git docs: add a category for user-facing file, repo and command UX
359 - - git help doc: use "<doc>" instead of "<guide>"
360 - - help.c: remove common category behavior from drop_prefix() behavior
361 - - help.c: refactor drop_prefix() to use a "switch" statement"
312 + (merged to 'next' on 2022-08-08 at 65c9ec7308)
313 + + docs: move http-protocol docs to man section 5
314 + + docs: move cruft pack docs to gitformat-pack
315 + + docs: move pack format docs to man section 5
316 + + docs: move signature docs to man section 5
317 + + docs: move index format docs to man section 5
318 + + docs: move protocol-related docs to man section 5
319 + + docs: move commit-graph format docs to man section 5
320 + + git docs: add a category for file formats, protocols and interfaces
321 + + git docs: add a category for user-facing file, repo and command UX
322 + + git help doc: use "<doc>" instead of "<guide>"
323 + + help.c: remove common category behavior from drop_prefix() behavior
324 + + help.c: refactor drop_prefix() to use a "switch" statement"
325
326 Expose a lot of "tech docs" via "git help" interface.
327
365 - Will merge to 'next'?
328 + Will merge to 'master'.
329 source: <cover-v8-00.12-00000000000-20220804T162138Z-avarab@gmail.com>
330
331
@@ -390,6 +353,10 @@ Release tarballs are available at:
353
354 Introduce the "subcommand" mode to parse-options API and update the
355 command line parser of Git commands with subcommands.
356 +
357 + Will merge to 'next'?
358 + There are some nits on how the changes are explained, but nothing major.
359 + cf. <xmqqa68x5c1i.fsf@gitster.g>
360 source: <20220725123857.2773963-1-szeder.dev@gmail.com>
361
362
@@ -401,18 +368,10 @@ Release tarballs are available at:
368 - remote-curl: add 'get' capability
369
370 Implement "git clone --bundle-uri".
404 - source: <pull.1300.v2.git.1659443384.gitgitgadget@gmail.com>
405 -
371
407 -* ca/unignore-local-installation-on-windows (2022-07-27) 1 commit
408 - (merged to 'next' on 2022-08-01 at 1d4f4c32a6)
409 - + cmake: support local installations of git
410 -
411 - Fix build procedure for Windows that uses CMake so that it can pick
412 - up the shell interpreter from local installation location.
413 -
414 - Will merge to 'master'.
415 - source: <pull.1304.git.1658912756815.gitgitgadget@gmail.com>
372 + Expecting a reroll.
373 + cf. <9afd5eb2-44a0-6342-6006-5dbdefba9947@github.com>
374 + source: <pull.1300.v2.git.1659443384.gitgitgadget@gmail.com>
375
376
377 * ds/decorate-filter-tweak (2022-08-05) 11 commits
@@ -430,6 +389,8 @@ Release tarballs are available at:
389
390 The namespaces used by "log --decorate" from "refs/" hierarchy by
391 default has been tightened.
392 +
393 + Will merge to 'next'?
394 source: <pull.1301.v3.git.1659722323.gitgitgadget@gmail.com>
395
396
@@ -441,28 +402,6 @@ Release tarballs are available at:
402 source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
403
404
444 -* js/lstat-mingw-enotdir-fix (2022-07-29) 1 commit
445 - (merged to 'next' on 2022-08-01 at 10499943b7)
446 - + lstat(mingw): correctly detect ENOTDIR scenarios
447 -
448 - Fix to lstat() emulation on Windows.
449 -
450 - Will merge to 'master'.
451 - source: <pull.1291.v3.git.1659089152877.gitgitgadget@gmail.com>
452 -
453 -
454 -* js/mingw-with-python (2022-07-29) 3 commits
455 - (merged to 'next' on 2022-08-01 at 73b8f06182)
456 - + mingw: remove unneeded `NO_CURL` directive
457 - + mingw: remove unneeded `NO_GETTEXT` directive
458 - + windows: include the Python bits when building Git for Windows
459 -
460 - Conditionally allow building Python interpreter on Windows
461 -
462 - Will merge to 'master'.
463 - source: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>
464 -
465 -
405 * ab/submodule-helper-prep (2022-08-03) 28 commits
406 - submodule--helper: fix bad config API usage
407 - submodule--helper: libify "must_die_on_failure" code paths (for die)
@@ -494,6 +433,10 @@ Release tarballs are available at:
433 - submodule tests: test usage behavior
434 (this branch is used by ab/submodule-helper-leakfix.)
435
436 + Code clean-up of "git submodule--helper".
437 +
438 + Expecting a (hopefully final?) reroll.
439 + cf. <220803.86h72tfpcc.gmgdl@evledraar.gmail.com>
440 source: <cover-v2-00.28-00000000000-20220802T154036Z-avarab@gmail.com>
441
442
@@ -518,43 +461,6 @@ Release tarballs are available at:
461 source: <cover-v2-0.9-00000000000-20220729T081959Z-avarab@gmail.com>
462
463
521 -* jk/struct-zero-init-with-older-gcc (2022-07-31) 1 commit
522 - (merged to 'next' on 2022-08-01 at cde4f95964)
523 - + config.mak.dev: squelch -Wno-missing-braces for older gcc
524 -
525 - Older gcc with -Wall complains about the universal zero initializer
526 - "struct s = { 0 };" idiom, which makes developers' lives
527 - inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The
528 - build procedure has been tweaked to help these compilers.
529 -
530 - Will merge to 'master'.
531 - source: <YuQ60ZUPBHAVETD7@coredump.intra.peff.net>
532 -
533 -
534 -* js/ort-clean-up-after-failed-merge (2022-07-31) 2 commits
535 - (merged to 'next' on 2022-08-01 at 0c9f02f3ec)
536 - + merge-ort: do leave trace2 region even if checkout fails
537 - + merge-ort: clean up after failed merge
538 -
539 - Plug memory leaks in the failure code path in the "merge-ort" merge
540 - strategy backend.
541 -
542 - Will merge to 'master'.
543 - source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
544 -
545 -
546 -* js/t5351-freebsd-fix (2022-07-29) 2 commits
547 - (merged to 'next' on 2022-08-01 at b47609e891)
548 - + t5351: avoid using `test_cmp` for binary data
549 - + t5351: avoid relying on `core.fsyncMethod = batch` to be supported
550 -
551 - Some tests assumed that core.fsyncMethod=batch is supported
552 - everywhere, which broke FreeBSD.
553 -
554 - Will merge to 'master'.
555 - source: <pull.1308.git.1659097724.gitgitgadget@gmail.com>
556 -
557 -
464 * cw/remote-object-info (2022-07-28) 6 commits
465 - cat-file: add remote-object-info to batch-command
466 - transport: add client support for object-info
@@ -564,6 +470,10 @@ Release tarballs are available at:
470 - fetch-pack: refactor packet writing
471
472 A client component to talk with the object-info endpoint.
473 +
474 + Expecting a reroll.
475 + cf. <20220728230210.2952731-1-calvinwan@google.com>
476 + cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
477 source: <20220728230210.2952731-1-calvinwan@google.com>
478
479
@@ -598,6 +508,9 @@ Release tarballs are available at:
508 - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
509
510 Test portability improvements.
511 +
512 + Expecting a reroll.
513 + cf. <CAHd-oW6GLf=4VxAvMy6c9jrGx1zcSHbe_NKbAUg7wvNBPOmEXw@mail.gmail.com>
514 source: <cover.1659291025.git.matheus.bernardino@usp.br>
515
516
@@ -645,18 +558,23 @@ Release tarballs are available at:
558 Update the message given when "git merge" sees conflicts at a path
559 with a submodule while merging a superproject.
560
648 - Getting closer?
561 + Will merge to 'next'?
562 source: <20220804195105.1303455-1-calvinwan@google.com>
563
564
652 -* js/safe-directory-plus (2022-07-13) 3 commits
653 - - mingw: be more informative when ownership check fails on FAT32
565 +* js/safe-directory-plus (2022-08-08) 5 commits
566 - mingw: handle a file owned by the Administrators group correctly
655 - - Allow debugging unsafe directories' ownership
567 + - mingw: be more informative when ownership check fails on FAT32
568 + - mingw: provide details about unsafe directories' ownership
569 + - setup: prepare for more detailed "dubious ownership" messages
570 + - setup: fix some formatting
571
657 - Expecting a reroll.
658 - cf. <8rqqnqp1-q613-ron6-6q8s-n7sq57o980q9@tzk.qr>
659 - source: <pull.1286.git.1657700238.gitgitgadget@gmail.com>
572 + Platform-specific code that determines if a directory is OK to use
573 + as a repository has been taught to report more details, especially
574 + on Windows.
575 +
576 + Will merge to 'next'.
577 + source: <pull.1286.v2.git.1659965270.gitgitgadget@gmail.com>
578
579
580 * po/doc-add-renormalize (2022-07-09) 1 commit
@@ -693,6 +611,7 @@ Release tarballs are available at:
611 The pack bitmap file gained a bitmap-lookup table to speed up
612 locating the necessary bitmap for a given commit.
613
614 + Expecting a reroll.
615 Seems to be flaky-broken under SHA-256.
616 cf. <p3r70610-8n52-s8q0-n641-onp4ps01330n@tzk.qr>
617 source: <pull.1266.v5.git.1658342304.gitgitgadget@gmail.com>