What's cooking (2022/07 #06)

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 19, 2022 at 17:41 UTC 7eb68a6da75761966bcf87def3aaef9743da1229
1 file changed +444 -414
whats-cooking.txt
+444 -414
@@ -1,9 +1,9 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Jul 2022, #05; Sun, 17)
3 -X-master-at: 9dd64cb4d310986dd7b8ca7fff92f9b61e0bd21a
4 -X-next-at: 4dd4a117ecf0e90cdeac8c0e51a870de51791f4a
2 +Subject: What's cooking in git.git (Jul 2022, #06; Tue, 19)
3 +X-master-at: e72d93e88cb20b06e88e6e7d81bd1dc4effe453f
4 +X-next-at: a122caa7aef2a7df25e111e06a49b1727cd52b08
5
6 -What's cooking in git.git (Jul 2022, #05; Sun, 17)
6 +What's cooking in git.git (Jul 2022, #06; Tue, 19)
7 --------------------------------------------------
8
9 Here are the topics that have been cooking in my tree. Commits
@@ -41,183 +41,355 @@ Release tarballs are available at:
41 https://www.kernel.org/pub/software/scm/git/
42
43 --------------------------------------------------
44 -[Graduated to 'master']
44 +[New Topics]
45
46 -* ab/submodule-cleanup (2022-06-28) 12 commits
47 - (merged to 'next' on 2022-07-08 at 6f3886aa03)
48 - + git-sh-setup.sh: remove "say" function, change last users
49 - + git-submodule.sh: use "$quiet", not "$GIT_QUIET"
50 - + submodule--helper: eliminate internal "--update" option
51 - + submodule--helper: understand --checkout, --merge and --rebase synonyms
52 - + submodule--helper: report "submodule" as our name in some "-h" output
53 - + submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
54 - + submodule update: remove "-v" option
55 - + submodule--helper: have --require-init imply --init
56 - + git-submodule.sh: remove unused top-level "--branch" argument
57 - + git-submodule.sh: make the "$cached" variable a boolean
58 - + git-submodule.sh: remove unused $prefix variable
59 - + git-submodule.sh: remove unused sanitize_submodule_env()
60 - (this branch is used by gc/submodule-use-super-prefix.)
61 -
62 - Further preparation to turn git-submodule.sh into a builtin.
63 - source: <cover-v4-00.12-00000000000-20220628T095914Z-avarab@gmail.com>
64 -
65 -
66 -* en/merge-tree (2022-06-22) 17 commits
67 - (merged to 'next' on 2022-07-08 at a29b4896ab)
68 - + git-merge-tree.txt: add a section on potentional usage mistakes
69 - + merge-tree: add a --allow-unrelated-histories flag
70 - + merge-tree: allow `ls-files -u` style info to be NUL terminated
71 - + merge-ort: optionally produce machine-readable output
72 - + merge-ort: store more specific conflict information
73 - + merge-ort: make `path_messages` a strmap to a string_list
74 - + merge-ort: store messages in a list, not in a single strbuf
75 - + merge-tree: provide easy access to `ls-files -u` style info
76 - + merge-tree: provide a list of which files have conflicts
77 - + merge-ort: remove command-line-centric submodule message from merge-ort
78 - + merge-ort: provide a merge_get_conflicted_files() helper function
79 - + merge-tree: support including merge messages in output
80 - + merge-ort: split out a separate display_update_messages() function
81 - + merge-tree: implement real merges
82 - + merge-tree: add option parsing and initial shell for real merge function
83 - + merge-tree: move logic for existing merge into new function
84 - + merge-tree: rename merge_trees() to trivial_merge_trees()
85 -
86 - "git merge-tree" learned a new mode where it takes two commits and
87 - computes a tree that would result in the merge commit, if the
88 - histories leading to these two commits were to be merged.
89 - source: <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>
90 -
91 -
92 -* gg/worktree-from-the-above (2022-06-21) 2 commits
93 - (merged to 'next' on 2022-07-08 at fa0e71ba39)
94 - + dir: minor refactoring / clean-up
95 - + dir: traverse into repository
96 -
97 - In a non-bare repository, the behavior of Git when the
98 - core.worktree configuration variable points at a directory that has
99 - a repository as its subdirectory, regressed in Git 2.27 days.
100 - source: <20220616234433.225-1-gg.oss@outlook.com>
101 - source: <20220616231956.154-1-gg.oss@outlook.com>
102 -
103 -
104 -* hx/unpack-streaming (2022-06-13) 6 commits
105 - (merged to 'next' on 2022-07-08 at 4eb375ec2f)
106 - + unpack-objects: use stream_loose_object() to unpack large objects
107 - + core doc: modernize core.bigFileThreshold documentation
108 - + object-file.c: add "stream_loose_object()" to handle large object
109 - + object-file.c: factor out deflate part of write_loose_object()
110 - + object-file.c: refactor write_loose_object() to several steps
111 - + unpack-objects: low memory footprint for get_data() in dry_run mode
112 -
113 - Allow large objects read from a packstream to be streamed into a
114 - loose object file straight, without having to keep it in-core as a
115 - whole.
116 - source: <cover.1654914555.git.chiyutianyi@gmail.com>
117 -
118 -
119 -* sy/mv-out-of-cone (2022-07-01) 8 commits
120 - (merged to 'next' on 2022-07-08 at 654970fdb7)
121 - + mv: add check_dir_in_index() and solve general dir check issue
122 - + mv: use flags mode for update_mode
123 - + mv: check if <destination> exists in index to handle overwriting
124 - + mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit
125 - + mv: decouple if/else-if checks using goto
126 - + mv: update sparsity after moving from out-of-cone to in-cone
127 - + t1092: mv directory from out-of-cone to in-cone
128 - + t7002: add tests for moving out-of-cone file/directory
129 -
130 - "git mv A B" in a sparsely populated working tree can be asked to
131 - move a path between directories that are "in cone" (i.e. expected
132 - to be materialized in the working tree) and "out of cone"
133 - (i.e. expected to be hidden). The handling of such cases has been
134 - improved.
135 - source: <20220630023737.473690-1-shaoxuan.yuan02@gmail.com>
46 +* ds/midx-with-less-memory (2022-07-19) 3 commits
47 + - midx: reduce memory pressure while writing bitmaps
48 + - midx: extract bitmap write setup
49 + - pack-bitmap-write: use const for hashes
50
137 ---------------------------------------------------
138 -[New Topics]
51 + The codepath to write multi-pack index has been taught to release a
52 + large chunk of memory that holds an array of objects in the packs,
53 + as soon as it is done with the array, to reduce memory consumption.
54
140 -* js/ci-github-workflow-markup (2022-07-14) 1 commit
141 - (merged to 'next' on 2022-07-15 at 196166f671)
142 - + tests: fix incorrect --write-junit-xml code
55 + Will merge to 'next'?
56 + source: <pull.1292.v2.git.1658244366.gitgitgadget@gmail.com>
57
144 - A fix for a regression in test framework.
58 +
59 +* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit
60 + (merged to 'next' on 2022-07-19 at c259b61b0e)
61 + + config/core.txt: fix minor issues for `core.sparseCheckoutCone`
62 +
63 + Docfix.
64
65 Will merge to 'master'.
147 - source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com>
66 + source: <20220718100530.2068354-1-martin.agren@gmail.com>
67
68
150 -* js/shortlog-sort-stably (2022-07-14) 1 commit
151 - (merged to 'next' on 2022-07-15 at 75e4efe678)
152 - + shortlog: use a stable sort
69 +* ma/t4200-update (2022-07-18) 1 commit
70 + (merged to 'next' on 2022-07-19 at 710d0cafd9)
71 + + t4200: drop irrelevant code
72
154 - "git shortlog -n" relied on the underlying qsort() to be stable,
155 - which shouldn't have. Fixed.
73 + Test fix.
74
75 Will merge to 'master'.
158 - source: <pull.1290.git.1657813429221.gitgitgadget@gmail.com>
76 + source: <20220718154322.2177166-1-martin.agren@gmail.com>
77
78
161 -* mt/doc-config (2022-07-14) 3 commits
162 - - doc: notes: unify configuration variables definitions
163 - - doc: apply: unify configuration variables definitions
164 - - doc: grep: unify configuration variables definitions
79 +* mb/config-document-include (2022-07-17) 1 commit
80 + (merged to 'next' on 2022-07-19 at 8267b80aa2)
81 + + config.txt: document include, includeIf
82
166 - Unify description of configuration variables used by individual
167 - commands in the documentation of the commands and the documentation
168 - of the "git config".
83 + Add missing documentation for "include" and "includeIf" features in
84 + "git config" file format, which incidentally teachs the command
85 + line completion to include them in its offerings.
86
170 - Retracted?.
171 - cf. <CAHd-oW4zHA1YLX-5B1vYTA1f8PocziUCi0WxvSEkFUuf2GqKxg@mail.gmail.com>
172 - source: <cover.1657819649.git.matheus.bernardino@usp.br>
87 + Will merge to 'master'.
88 + source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com>
89
90
175 -* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit
176 - (merged to 'next' on 2022-07-15 at 4dd4a117ec)
177 - + mingw: avoid mktemp() in mkstemp() implementation
91 +* sg/index-format-doc-update (2022-07-18) 1 commit
92 + (merged to 'next' on 2022-07-19 at ccc384be5e)
93 + + index-format.txt: remove outdated list of supported extensions
94
179 - mkstemp() emulation on Windows has been improved.
95 + Docfix.
96
97 Will merge to 'master'.
182 - source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de>
98 + source: <20220718085640.7395-1-szeder.dev@gmail.com>
99
100
185 -* jt/fetch-pack-trace2-filter-spec (2022-07-15) 1 commit
186 - - fetch-pack: write effective filter to trace2
101 +* tl/pack-bitmap-error-messages (2022-07-18) 6 commits
102 + (merged to 'next' on 2022-07-19 at 3f9565653a)
103 + + pack-bitmap.c: continue looping when first MIDX bitmap is found
104 + + pack-bitmap.c: using error() instead of silently returning -1
105 + + pack-bitmap.c: do not ignore error when opening a bitmap file
106 + + pack-bitmap.c: rename "idx_name" to "bitmap_name"
107 + + pack-bitmap.c: mark more strings for translations
108 + + pack-bitmap.c: fix formatting of error messages
109
188 - "git fetch" client logs the partial clone filter used in the trace2
189 - output.
110 + Tweak various messages that come from the pack-bitmap codepaths.
111
191 - Will merge to 'next'?
192 - source: <20220715172943.2681492-1-jonathantanmy@google.com>
112 + Will merge to 'master'.
113 + source: <cover.1658159745.git.dyroneteng@gmail.com>
114
115
195 -* mb/doc-rerere-autoupdate (2022-07-15) 1 commit
196 - - cherry-pick doc: clarify no-rerere-autoupdate still allows rerere
116 +* tl/trace2-config-scope (2022-07-18) 1 commit
117 + - tr2: dump names if config exist in multiple scopes
118
198 - Clarifies that the "--no-rerere-autoupdate" option does not disable
199 - the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).
119 + Tweak trace2 output about configuration variables.
120
201 - Will merge to 'next'?
202 - source: <20220715092527.1567837-1-mail@beyermatthias.de>
121 + Expecting a reroll.
122 + cf. <20220719074053.37282-1-tenglong.tl@tenglongtldeMacBook-Pro.local>
123 + source: <a01ae8478d3a8545241c5b064b6d369a330ee59f.1658159746.git.dyroneteng@gmail.com>
124
125
205 -* rs/mergesort (2022-07-17) 10 commits
206 - - mergesort: remove llist_mergesort()
207 - - packfile: use DEFINE_LIST_SORT
208 - - fetch-pack: use DEFINE_LIST_SORT
209 - - commit: use DEFINE_LIST_SORT
210 - - blame: use DEFINE_LIST_SORT
211 - - test-mergesort: use DEFINE_LIST_SORT
212 - - test-mergesort: use DEFINE_LIST_SORT_DEBUG
213 - - mergesort: add macros for typed sort of linked lists
214 - - mergesort: tighten merge loop
215 - - mergesort: unify ranks loops
126 +* vd/scalar-doc (2022-07-18) 2 commits
127 + - scalar: convert README.md into a technical design doc
128 + - scalar: reword command documentation to clarify purpose
129
217 - source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>
130 + Doc update.
131 +
132 + Will merge to 'next'.
133 + source: <pull.1275.v2.git.1657584367.gitgitgadget@gmail.com>
134 +
135 +
136 +* cl/rerere-train-with-no-sign (2022-07-19) 1 commit
137 + - contrib/rerere-train: avoid useless gpg sign in training
138 +
139 + "rerere-train" script (in contrib/) used to honor commit.gpgSign
140 + while recreating the throw-away merges.
141 +
142 + Will merge to 'next'.
143 + source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
144 +
145 +
146 +* ds/win-syslog-compiler-fix (2022-07-19) 1 commit
147 + - compat/win32: correct for incorrect compiler warning
148 +
149 + Workaround for a false positive compiler warning.
150 +
151 + Will merge to 'next'.
152 + source: <pull.1294.git.1658256354725.gitgitgadget@gmail.com>
153 +
154 +
155 +* ld/osx-keychain-usage-fix (2022-07-19) 1 commit
156 + - osx-keychain: fix compiler warning
157 +
158 + Workaround for a compiler warning against use of die() in
159 + osx-keychain (in contrib/).
160 +
161 + Will merge to 'next'.
162 + source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com>
163 +
164 +
165 +* ab/submodule-helper-leakfix (2022-07-19) 24 commits
166 + - submodule--helper: fix a configure_added_submodule() leak
167 + - submodule--helper: fix bad config API usage
168 + - submodule--helper: free rest of "displaypath" in "struct update_data"
169 + - submodule--helper: don't exit() on failure, return
170 + - submodule--helper: add skeleton "goto cleanup" to update_submodule()
171 + - submodule--helper: rename "int res" to "int ret"
172 + - submodule--helper: free some "displaypath" in "struct update_data"
173 + - submodule--helper: fix a memory leak in print_status()
174 + - submodule--helper: fix a leak in module_add()
175 + - submodule--helper: fix obscure leak in module_add()
176 + - submodule--helper: fix "reference" leak is "module_clone_data"
177 + - submodule--helper: fix a memory leak in get_default_remote_submodule()
178 + - submodule--helper: fix a leak with repo_clear()
179 + - submodule--helper: fix "sm_path" and other "module_cb_list" leaks
180 + - submodule--helper: fix "errmsg_str" memory leak
181 + - submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
182 + - submodule--helper: add and use *_release() functions
183 + - submodule--helper: add "const" to copy of "update_data"
184 + - submodule--helper: don't leak {run,capture}_command() cp.dir argument
185 + - submodule--helper: "struct pathspec" memory leak in module_update()
186 + - submodule--helper: fix most "struct pathspec" memory leaks
187 + - submodule--helper: fix trivial get_default_remote_submodule() leak
188 + - submodule--helper: fix a leak in "clone_submodule"
189 + - submodule--helper: replace memset() with { 0 }-initialization
190 +
191 + Plugging leaks in submodule--helper.
192 +
193 + Needs review.
194 + source: <cover-v2-00.24-00000000000-20220719T204458Z-avarab@gmail.com>
195
196 --------------------------------------------------
220 -[Stalled]
197 +[Graduated to 'master']
198 +
199 +* ab/build-gitweb (2022-06-28) 8 commits
200 + (merged to 'next' on 2022-07-11 at 731e354ff0)
201 + + gitweb/Makefile: add a "NO_GITWEB" parameter
202 + + Makefile: build 'gitweb' in the default target
203 + + gitweb/Makefile: include in top-level Makefile
204 + + gitweb: remove "test" and "test-installed" targets
205 + + gitweb/Makefile: prepare to merge into top-level Makefile
206 + + gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars
207 + + gitweb/Makefile: add a $(GITWEB_ALL) variable
208 + + gitweb/Makefile: define all .PHONY prerequisites inline
209 +
210 + Teach "make all" to build gitweb as well.
211 + source: <cover-v3-0.8-00000000000-20220628T100936Z-avarab@gmail.com>
212 +
213 +
214 +* ab/cocci-unused (2022-07-06) 6 commits
215 + (merged to 'next' on 2022-07-11 at 7fa60d2a5b)
216 + + cocci: generalize "unused" rule to cover more than "strbuf"
217 + + cocci: add and apply a rule to find "unused" strbufs
218 + + cocci: have "coccicheck{,-pending}" depend on "coccicheck-test"
219 + + cocci: add a "coccicheck-test" target and test *.cocci rules
220 + + Makefile & .gitignore: ignore & clean "git.res", not "*.res"
221 + + Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS
222 +
223 + Add Coccinelle rules to detect the pattern of initializing and then
224 + finalizing a structure without using it in between at all, which
225 + happens after code restructuring and the compilers fail to
226 + recognize as an unused variable.
227 + source: <cover-v4-0.6-00000000000-20220705T134033Z-avarab@gmail.com>
228 +
229 +
230 +* ab/leakfix (2022-07-01) 11 commits
231 + (merged to 'next' on 2022-07-11 at 0b107fffcf)
232 + + pull: fix a "struct oid_array" memory leak
233 + + cat-file: fix a common "struct object_context" memory leak
234 + + gc: fix a memory leak
235 + + checkout: avoid "struct unpack_trees_options" leak
236 + + merge-file: fix memory leaks on error path
237 + + merge-file: refactor for subsequent memory leak fix
238 + + cat-file: fix a memory leak in --batch-command mode
239 + + revert: free "struct replay_opts" members
240 + + submodule.c: free() memory from xgetcwd()
241 + + clone: fix memory leak in wanted_peer_refs()
242 + + check-ref-format: fix trivial memory leak
243 +
244 + Plug various memory leaks.
245 + source: <cover-v2-00.11-00000000000-20220701T104017Z-avarab@gmail.com>
246 +
247 +
248 +* ab/test-tool-leakfix (2022-07-01) 9 commits
249 + (merged to 'next' on 2022-07-11 at db7a724694)
250 + + test-tool delta: fix a memory leak
251 + + test-tool ref-store: fix a memory leak
252 + + test-tool bloom: fix memory leaks
253 + + test-tool json-writer: fix memory leaks
254 + + test-tool regex: call regfree(), fix memory leaks
255 + + test-tool urlmatch-normalization: fix a memory leak
256 + + test-tool {dump,scrap}-cache-tree: fix memory leaks
257 + + test-tool path-utils: fix a memory leak
258 + + test-tool test-hash: fix a memory leak
259 +
260 + Plug various memory leaks in test-tool commands.
261 + source: <cover-v2-0.9-00000000000-20220701T103503Z-avarab@gmail.com>
262 +
263 +
264 +* ab/test-without-templates (2022-06-06) 7 commits
265 + (merged to 'next' on 2022-07-11 at afab6c1918)
266 + + tests: don't assume a .git/info for .git/info/sparse-checkout
267 + + tests: don't assume a .git/info for .git/info/exclude
268 + + tests: don't assume a .git/info for .git/info/refs
269 + + tests: don't assume a .git/info for .git/info/attributes
270 + + tests: don't assume a .git/info for .git/info/grafts
271 + + tests: don't depend on template-created .git/branches
272 + + t0008: don't rely on default ".git/info/exclude"
273 +
274 + Tweak tests so that they still work when the "git init" template
275 + did not create .git/info directory.
276 + source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>
277 +
278 +
279 +* bc/nettle-sha256 (2022-07-10) 1 commit
280 + (merged to 'next' on 2022-07-11 at cf9595d8ca)
281 + + sha256: add support for Nettle
282 +
283 + Support for libnettle as SHA256 implementation has been added.
284 + source: <20220710132907.1499365-1-sandals@crustytoothpaste.net>
285 +
286 +
287 +* en/merge-dual-dir-renames-fix (2022-07-06) 5 commits
288 + (merged to 'next' on 2022-07-11 at 5f8dadf87b)
289 + + merge-ort: fix issue with dual rename and add/add conflict
290 + + merge-ort: shuffle the computation and cleanup of potential collisions
291 + + merge-ort: make a separate function for freeing struct collisions
292 + + merge-ort: small cleanups of check_for_directory_rename
293 + + t6423: add tests of dual directory rename plus add/add conflict
294 +
295 + Fixes a long-standing corner case bug around directory renames in
296 + the merge-ort strategy.
297 + source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
298 +
299 +
300 +* fr/vimdiff-layout-fix (2022-07-08) 1 commit
301 + (merged to 'next' on 2022-07-09 at d8461bd236)
302 + + vimdiff: make layout engine more robust against user vim settings
303 +
304 + Recent update to vimdiff layout code has been made more robust
305 + against different end-user vim settings.
306 + source: <20220708181024.45839-1-greenfoo@u92.eu>
307 +
308 +
309 +* gc/submodule-use-super-prefix (2022-06-30) 8 commits
310 + (merged to 'next' on 2022-07-11 at 0d9cf172f9)
311 + + submodule--helper: remove display path helper
312 + + submodule--helper update: use --super-prefix
313 + + submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags
314 + + submodule--helper: use correct display path helper
315 + + submodule--helper: don't recreate recursive prefix
316 + + submodule--helper update: use display path helper
317 + + submodule--helper tests: add missing "display path" coverage
318 + + Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix
319 +
320 + Another step to rewrite more parts of "git submodule" in C.
321 + source: <20220701021157.88858-1-chooglen@google.com>
322 +
323 +
324 +* hx/lookup-commit-in-graph-fix (2022-07-12) 2 commits
325 + (merged to 'next' on 2022-07-13 at 4489696814)
326 + + t5330: remove run_with_limited_processses()
327 + (merged to 'next' on 2022-07-08 at cef32db0b6)
328 + + commit-graph.c: no lazy fetch in lookup_commit_in_graph()
329 +
330 + A corner case bug where lazily fetching objects from a promisor
331 + remote resulted in infinite recursion has been corrected.
332 + source: <cover.1656593279.git.hanxin.hx@bytedance.com>
333 +
334 +
335 +* jc/builtin-mv-move-array (2022-07-09) 1 commit
336 + (merged to 'next' on 2022-07-09 at 0d3b3f62e5)
337 + + builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
338 +
339 + Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
340 + macro, which would improve maintainability and readability.
341 + source: <xmqq4jzpu4xp.fsf_-_@gitster.g>
342 +
343 +
344 +* jc/resolve-undo (2022-07-11) 2 commits
345 + (merged to 'next' on 2022-07-13 at b9ef9482e8)
346 + + fsck: do not dereference NULL while checking resolve-undo data
347 + (merged to 'next' on 2022-06-15 at c195e5a2d9)
348 + + revision: mark blobs needed for resolve-undo as reachable
349 +
350 + The resolve-undo information in the index was not protected against
351 + GC, which has been corrected.
352 + source: <xmqq35f7kzad.fsf@gitster.g>
353 +
354 +
355 +* jd/gpg-interface-trust-level-string (2022-07-10) 1 commit
356 + (merged to 'next' on 2022-07-11 at 7b3cca73a8)
357 + + gpg-interface: add function for converting trust level to string
358 +
359 + The code to convert between GPG trust level strings and internal
360 + constants we use to represent them have been cleaned up.
361 + source: <pull.1281.v4.git.1657515650587.gitgitgadget@gmail.com>
362 +
363 +
364 +* jk/clone-unborn-confusion (2022-07-11) 4 commits
365 + (merged to 'next' on 2022-07-13 at a7ae8cb4b5)
366 + + clone: move unborn head creation to update_head()
367 + + clone: use remote branch if it matches default HEAD
368 + + clone: propagate empty remote HEAD even with other branches
369 + + clone: drop extra newline from warning message
370 +
371 + "git clone" from a repository with some ref whose HEAD is unborn
372 + did not set the HEAD in the resulting repository correctly, which
373 + has been corrected.
374 + source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net>
375 +
376 +
377 +* jk/diff-files-cleanup-fix (2022-07-12) 1 commit
378 + (merged to 'next' on 2022-07-13 at 9db5235d01)
379 + + diff-files: move misplaced cleanup label
380 +
381 + An earlier attempt to plug leaks placed a clean-up label to jump to
382 + at a bogus place, which as been corrected.
383 + source: <Ys0c0ePxPOqZ/5ck@coredump.intra.peff.net>
384 +
385 +
386 +* jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit
387 + (merged to 'next' on 2022-07-13 at d1521724db)
388 + + ref-filter: disable save_commit_buffer while traversing
389 +
390 + Will merge to 'master'.
391 + source: <Ysw4JtoHW1vWmqhz@coredump.intra.peff.net>
392 +
393
394 * ll/curl-accept-language (2022-07-11) 1 commit
395 (merged to 'next' on 2022-07-13 at 076aba7421)
@@ -226,11 +398,28 @@ Release tarballs are available at:
398 Earlier, HTTP transport clients learned to tell the server side
399 what locale they are in by sending Accept-Language HTTP header, but
400 this was done only for some requests but not others.
229 -
230 - Will merge to 'master'.
401 source: <pull.1251.v4.git.1657519134336.gitgitgadget@gmail.com>
402
403
404 +* rs/cocci-array-copy (2022-07-10) 1 commit
405 + (merged to 'next' on 2022-07-13 at f21dec0f71)
406 + + cocci: avoid normalization rules for memcpy
407 +
408 + A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
409 + macro has been improved.
410 + source: <ded153d4-4aea-d4da-11cb-ec66d181e4c9@web.de>
411 +
412 +
413 +* sg/multi-pack-index-parse-options-fix (2022-07-10) 1 commit
414 + (merged to 'next' on 2022-07-11 at 1e14685680)
415 + + multi-pack-index: simplify handling of unknown --options
416 +
417 + The way "git multi-pack" uses parse-options API has been improved.
418 + source: <20220710151645.GA2038@szeder.dev>
419 +
420 +--------------------------------------------------
421 +[Stalled]
422 +
423 * bc/stash-export (2022-04-08) 4 commits
424 - builtin/stash: provide a way to import stashes from a ref
425 - builtin/stash: provide a way to export stashes to a ref
@@ -266,36 +455,110 @@ Release tarballs are available at:
455 --------------------------------------------------
456 [Cooking]
457
269 -* jk/diff-files-cleanup-fix (2022-07-12) 1 commit
270 - (merged to 'next' on 2022-07-13 at 9db5235d01)
271 - + diff-files: move misplaced cleanup label
458 +* js/ci-github-workflow-markup (2022-07-14) 1 commit
459 + (merged to 'next' on 2022-07-15 at 196166f671)
460 + + tests: fix incorrect --write-junit-xml code
461 +
462 + A fix for a regression in test framework.
463 +
464 + Will merge to 'master'.
465 + source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com>
466 +
467 +
468 +* js/shortlog-sort-stably (2022-07-14) 1 commit
469 + (merged to 'next' on 2022-07-15 at 75e4efe678)
470 + + shortlog: use a stable sort
471 +
472 + "git shortlog -n" relied on the underlying qsort() to be stable,
473 + which shouldn't have. Fixed.
474 +
475 + Will merge to 'master'.
476 + source: <pull.1290.git.1657813429221.gitgitgadget@gmail.com>
477 +
478 +
479 +* mt/doc-config (2022-07-14) 3 commits
480 + - doc: notes: unify configuration variables definitions
481 + - doc: apply: unify configuration variables definitions
482 + - doc: grep: unify configuration variables definitions
483 +
484 + Unify description of configuration variables used by individual
485 + commands in the documentation of the commands and the documentation
486 + of the "git config".
487 +
488 + Will discard (Retracted?).
489 + cf. <CAHd-oW4zHA1YLX-5B1vYTA1f8PocziUCi0WxvSEkFUuf2GqKxg@mail.gmail.com>
490 + source: <cover.1657819649.git.matheus.bernardino@usp.br>
491 +
492 +
493 +* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit
494 + (merged to 'next' on 2022-07-15 at 4dd4a117ec)
495 + + mingw: avoid mktemp() in mkstemp() implementation
496 +
497 + mkstemp() emulation on Windows has been improved.
498 +
499 + Will merge to 'master'.
500 + source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de>
501 +
502 +
503 +* jt/fetch-pack-trace2-filter-spec (2022-07-18) 1 commit
504 + - fetch-pack: write effective filter to trace2
505 +
506 + "git fetch" client logs the partial clone filter used in the trace2
507 + output.
508 +
509 + Will merge to 'next'?
510 + source: <20220718170027.3993042-1-jonathantanmy@google.com>
511 +
512 +
513 +* mb/doc-rerere-autoupdate (2022-07-15) 1 commit
514 + - cherry-pick doc: clarify no-rerere-autoupdate still allows rerere
515 +
516 + Clarifies that the "--no-rerere-autoupdate" option does not disable
517 + the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).
518 +
519 + Will merge to 'next'?
520 + source: <20220715092527.1567837-1-mail@beyermatthias.de>
521 +
522 +
523 +* rs/mergesort (2022-07-17) 10 commits
524 + - mergesort: remove llist_mergesort()
525 + - packfile: use DEFINE_LIST_SORT
526 + - fetch-pack: use DEFINE_LIST_SORT
527 + - commit: use DEFINE_LIST_SORT
528 + - blame: use DEFINE_LIST_SORT
529 + - test-mergesort: use DEFINE_LIST_SORT
530 + - test-mergesort: use DEFINE_LIST_SORT_DEBUG
531 + - mergesort: add macros for typed sort of linked lists
532 + - mergesort: tighten merge loop
533 + - mergesort: unify ranks loops
534
273 - An earlier attempt to plug leaks placed a clean-up label to jump to
274 - at a bogus place, which as been corrected.
535 + Make our mergesort implementation type-safe.
536
276 - Will merge to 'master'.
277 - source: <Ys0c0ePxPOqZ/5ck@coredump.intra.peff.net>
537 + Will merge to 'next'?
538 + source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>
539
540
280 -* cw/submodule-merge-messages (2022-07-13) 1 commit
541 +* cw/submodule-merge-messages (2022-07-18) 1 commit
542 - submodule merge: update conflict error message
543
544 Update the message given when "git merge" sees conflicts at a path
545 with a submodule while merging a superproject.
546
547 Needs review.
287 - source: <20220712231935.2979727-1-calvinwan@google.com>
548 + source: <20220718214349.3379328-1-calvinwan@google.com>
549
550
290 -* ds/doc-wo-whitelist (2022-07-14) 3 commits
291 - - *: avoid "whitelist"
292 - - t/*: avoid "whitelist"
293 - - Documentation: remove use of whitelist
551 +* ds/doc-wo-whitelist (2022-07-19) 5 commits
552 + - transport.c: avoid "whitelist"
553 + - t: avoid "whitelist"
554 + - git.txt: remove redundant language
555 + - git-cvsserver: clarify directory list
556 + - daemon: clarify directory arguments
557
558 Avoid "white/black-list" in documentation and code comments.
559
297 - Will merge to 'next'?
298 - source: <pull.1274.v2.git.1657852722.gitgitgadget@gmail.com>
560 + Will merge to 'next'.
561 + source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com>
562
563
564 * js/vimdiff-quotepath-fix (2022-07-14) 1 commit
@@ -364,68 +627,6 @@ Release tarballs are available at:
627 source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
628
629
367 -* rs/cocci-array-copy (2022-07-10) 1 commit
368 - (merged to 'next' on 2022-07-13 at f21dec0f71)
369 - + cocci: avoid normalization rules for memcpy
370 -
371 - A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
372 - macro has been improved.
373 -
374 - Will merge to 'master'.
375 - source: <ded153d4-4aea-d4da-11cb-ec66d181e4c9@web.de>
376 -
377 -
378 -* sg/multi-pack-index-parse-options-fix (2022-07-10) 1 commit
379 - (merged to 'next' on 2022-07-11 at 1e14685680)
380 - + multi-pack-index: simplify handling of unknown --options
381 -
382 - The way "git multi-pack" uses parse-options API has been improved.
383 -
384 - Will merge to 'master'.
385 - source: <20220710151645.GA2038@szeder.dev>
386 -
387 -
388 -* jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit
389 - (merged to 'next' on 2022-07-13 at d1521724db)
390 - + ref-filter: disable save_commit_buffer while traversing
391 -
392 - Will merge to 'master'.
393 - source: <Ysw4JtoHW1vWmqhz@coredump.intra.peff.net>
394 -
395 -
396 -* ab/cocci-unused (2022-07-06) 6 commits
397 - (merged to 'next' on 2022-07-11 at 7fa60d2a5b)
398 - + cocci: generalize "unused" rule to cover more than "strbuf"
399 - + cocci: add and apply a rule to find "unused" strbufs
400 - + cocci: have "coccicheck{,-pending}" depend on "coccicheck-test"
401 - + cocci: add a "coccicheck-test" target and test *.cocci rules
402 - + Makefile & .gitignore: ignore & clean "git.res", not "*.res"
403 - + Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS
404 -
405 - Add Coccinelle rules to detect the pattern of initializing and then
406 - finalizing a structure without using it in between at all, which
407 - happens after code restructuring and the compilers fail to
408 - recognize as an unused varilable.
409 -
410 - Will merge to 'master'.
411 - source: <cover-v4-0.6-00000000000-20220705T134033Z-avarab@gmail.com>
412 -
413 -
414 -* jk/clone-unborn-confusion (2022-07-11) 4 commits
415 - (merged to 'next' on 2022-07-13 at a7ae8cb4b5)
416 - + clone: move unborn head creation to update_head()
417 - + clone: use remote branch if it matches default HEAD
418 - + clone: propagate empty remote HEAD even with other branches
419 - + clone: drop extra newline from warning message
420 -
421 - "git clone" from a repository with some ref whose HEAD is unborn
422 - did not set the HEAD in the resulting repository correctly, which
423 - has been corrected.
424 -
425 - Will merge to 'master'.
426 - source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net>
427 -
428 -
630 * ac/bitmap-lookup-table (2022-07-06) 6 commits
631 - p5310-pack-bitmaps.sh: remove pack.writeReverseIndex
632 - bitmap-lookup-table: add performance tests for lookup table
@@ -442,38 +643,6 @@ Release tarballs are available at:
643 source: <pull.1266.v3.git.1656924376.gitgitgadget@gmail.com>
644
645
445 -* bc/nettle-sha256 (2022-07-10) 1 commit
446 - (merged to 'next' on 2022-07-11 at cf9595d8ca)
447 - + sha256: add support for Nettle
448 -
449 - Support for libnettle as SHA256 implementation has been added.
450 -
451 - Will merge to 'master'.
452 - source: <20220710132907.1499365-1-sandals@crustytoothpaste.net>
453 -
454 -
455 -* jc/builtin-mv-move-array (2022-07-09) 1 commit
456 - (merged to 'next' on 2022-07-09 at 0d3b3f62e5)
457 - + builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
458 -
459 - Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
460 - macro, which would improve maintainability and readability.
461 -
462 - Will merge to 'master'.
463 - source: <xmqq4jzpu4xp.fsf_-_@gitster.g>
464 -
465 -
466 -* jd/gpg-interface-trust-level-string (2022-07-10) 1 commit
467 - (merged to 'next' on 2022-07-11 at 7b3cca73a8)
468 - + gpg-interface: add function for converting trust level to string
469 -
470 - The code to convert between GPG trust level strings and internal
471 - constants we use to represent them have been cleaned up.
472 -
473 - Will merge to 'master'.
474 - source: <pull.1281.v4.git.1657515650587.gitgitgadget@gmail.com>
475 -
476 -
646 * kk/p4-client-name-encoding-fix (2022-07-08) 1 commit
647 (merged to 'next' on 2022-07-11 at 9c18616f76)
648 + git-p4: fix bug with encoding of p4 client name
@@ -481,11 +650,12 @@ Release tarballs are available at:
650 "git p4" did not handle non-ASCII client name well, which has been
651 corrected.
652
484 - Will merge to 'master'.
653 + On hold, waiting for a follow-up.
654 + cf. <xmqqcze2s7h0.fsf@gitster.g>
655 source: <pull.1285.git.git.1657267260405.gitgitgadget@gmail.com>
656
657
488 -* sa/cat-file-mailmap (2022-07-17) 4 commits
658 +* sa/cat-file-mailmap (2022-07-18) 4 commits
659 - cat-file: add mailmap support
660 - ident: rename commit_rewrite_person() to apply_mailmap_to_header()
661 - ident: move commit_rewrite_person() to ident.c
@@ -494,23 +664,11 @@ Release tarballs are available at:
664 "git cat-file" learned an option to use the mailmap when showing
665 commit and tag objects.
666
497 - Expecting a reroll; I think this is almost there.
498 - cf. <xmqqo7xnv17x.fsf@gitster.g>
499 - source: <20220716074055.1786231-1-siddharthasthana31@gmail.com>
500 -
501 -
502 -* fr/vimdiff-layout-fix (2022-07-08) 1 commit
503 - (merged to 'next' on 2022-07-09 at d8461bd236)
504 - + vimdiff: make layout engine more robust against user vim settings
505 -
506 - Recent update to vimdiff layout code has been made more robust
507 - against different end-user vim settings.
508 -
509 - Will merge to 'master'.
510 - source: <20220708181024.45839-1-greenfoo@u92.eu>
667 + Will merge to 'next'?
668 + source: <20220718195102.66321-1-siddharthasthana31@gmail.com>
669
670
513 -* ds/rebase-update-ref (2022-07-12) 13 commits
671 +* ds/rebase-update-ref (2022-07-19) 13 commits
672 - sequencer: notify user of --update-refs activity
673 - sequencer: ignore HEAD ref under --update-refs
674 - rebase: add rebase.updateRefs config option
@@ -529,75 +687,7 @@ Release tarballs are available at:
687 rebased range.
688
689 Will merge to 'next'?
532 - source: <pull.1247.v4.git.1657631225.gitgitgadget@gmail.com>
533 -
534 -
535 -* ab/leakfix (2022-07-01) 11 commits
536 - (merged to 'next' on 2022-07-11 at 0b107fffcf)
537 - + pull: fix a "struct oid_array" memory leak
538 - + cat-file: fix a common "struct object_context" memory leak
539 - + gc: fix a memory leak
540 - + checkout: avoid "struct unpack_trees_options" leak
541 - + merge-file: fix memory leaks on error path
542 - + merge-file: refactor for subsequent memory leak fix
543 - + cat-file: fix a memory leak in --batch-command mode
544 - + revert: free "struct replay_opts" members
545 - + submodule.c: free() memory from xgetcwd()
546 - + clone: fix memory leak in wanted_peer_refs()
547 - + check-ref-format: fix trivial memory leak
548 -
549 - Plug various memory leaks.
550 -
551 - Will merge to 'master'.
552 - source: <cover-v2-00.11-00000000000-20220701T104017Z-avarab@gmail.com>
553 -
554 -
555 -* ab/test-tool-leakfix (2022-07-01) 9 commits
556 - (merged to 'next' on 2022-07-11 at db7a724694)
557 - + test-tool delta: fix a memory leak
558 - + test-tool ref-store: fix a memory leak
559 - + test-tool bloom: fix memory leaks
560 - + test-tool json-writer: fix memory leaks
561 - + test-tool regex: call regfree(), fix memory leaks
562 - + test-tool urlmatch-normalization: fix a memory leak
563 - + test-tool {dump,scrap}-cache-tree: fix memory leaks
564 - + test-tool path-utils: fix a memory leak
565 - + test-tool test-hash: fix a memory leak
566 -
567 - Plug various memory leaks in test-tool commands.
568 -
569 - Will merge to 'master'.
570 - source: <cover-v2-0.9-00000000000-20220701T103503Z-avarab@gmail.com>
571 -
572 -
573 -* gc/submodule-use-super-prefix (2022-06-30) 8 commits
574 - (merged to 'next' on 2022-07-11 at 0d9cf172f9)
575 - + submodule--helper: remove display path helper
576 - + submodule--helper update: use --super-prefix
577 - + submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags
578 - + submodule--helper: use correct display path helper
579 - + submodule--helper: don't recreate recursive prefix
580 - + submodule--helper update: use display path helper
581 - + submodule--helper tests: add missing "display path" coverage
582 - + Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix
583 -
584 - Another step to rewrite more parts of "git submodule" in C.
585 -
586 - Will merge to 'master'.
587 - source: <20220701021157.88858-1-chooglen@google.com>
588 -
589 -
590 -* hx/lookup-commit-in-graph-fix (2022-07-12) 2 commits
591 - (merged to 'next' on 2022-07-13 at 4489696814)
592 - + t5330: remove run_with_limited_processses()
593 - (merged to 'next' on 2022-07-08 at cef32db0b6)
594 - + commit-graph.c: no lazy fetch in lookup_commit_in_graph()
595 -
596 - A corner case bug where lazily fetching objects from a promisor
597 - remote resulted in infinite recursion has been corrected.
598 -
599 - Will merge to 'master'.
600 - source: <cover.1656593279.git.hanxin.hx@bytedance.com>
690 + source: <pull.1247.v5.git.1658255624.gitgitgadget@gmail.com>
691
692
693 * pw/xdiff-alloc (2022-07-08) 4 commits
@@ -613,13 +703,14 @@ Release tarballs are available at:
703 source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
704
705
616 -* ab/squelch-empty-fsync-traces (2022-06-30) 1 commit
617 - . trace2: don't include "fsync" events in all trace2 logs
706 +* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit
707 + (merged to 'next' on 2022-07-19 at f77cd40c29)
708 + + trace2: only include "fsync" events if we git_fsync()
709
710 Omit fsync-related trace2 entries when their values are all zero.
711
621 - Breaks tests in hx/unpack-streaming with an interesting interaction.
622 - source: <patch-v2-1.1-a1fc37de947-20220630T084607Z-avarab@gmail.com>
712 + Will merge to 'master'.
713 + source: <patch-v3-1.1-979dea5956a-20220718T102747Z-avarab@gmail.com>
714
715
716 * en/merge-restore-to-pristine (2022-06-21) 6 commits
@@ -634,7 +725,7 @@ Release tarballs are available at:
725 restore the working tree to the state before the command was
726 initiated, but in some corner cases it didn't.
727
637 - Needs review.
728 + Under review.
729 source: <pull.1231.v2.git.1655621424.gitgitgadget@gmail.com>
730
731
@@ -659,27 +750,13 @@ Release tarballs are available at:
750 source: <pull.1262.v7.git.1657692472994.gitgitgadget@gmail.com>
751
752
662 -* en/merge-dual-dir-renames-fix (2022-07-06) 5 commits
663 - (merged to 'next' on 2022-07-11 at 5f8dadf87b)
664 - + merge-ort: fix issue with dual rename and add/add conflict
665 - + merge-ort: shuffle the computation and cleanup of potential collisions
666 - + merge-ort: make a separate function for freeing struct collisions
667 - + merge-ort: small cleanups of check_for_directory_rename
668 - + t6423: add tests of dual directory rename plus add/add conflict
669 -
670 - Fixes a long-standing corner case bug around directory renames in
671 - the merge-ort strategy.
672 -
673 - Will merge to 'master'.
674 - source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
675 -
676 -
753 * js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit
678 - - commit-graph: pass repo_settings instead of repository
754 + (merged to 'next' on 2022-07-19 at bcc29d823d)
755 + + commit-graph: pass repo_settings instead of repository
756
757 API tweak to make it easier to run fuzz testing on commit-graph parser.
758
682 - Will merge to 'next'.
759 + Will merge to 'master'.
760 source: <fd70b6119153b165a62ee4f693dbe47031cfb2be.1657834657.git.steadmon@google.com>
761
762
@@ -696,53 +773,6 @@ Release tarballs are available at:
773 source: <20220610195247.1177549-1-jonathantanmy@google.com>
774
775
699 -* jc/resolve-undo (2022-07-11) 2 commits
700 - (merged to 'next' on 2022-07-13 at b9ef9482e8)
701 - + fsck: do not dereference NULL while checking resolve-undo data
702 - (merged to 'next' on 2022-06-15 at c195e5a2d9)
703 - + revision: mark blobs needed for resolve-undo as reachable
704 -
705 - The resolve-undo information in the index was not protected against
706 - GC, which has been corrected.
707 -
708 - Will merge to 'master'.
709 - source: <xmqq35f7kzad.fsf@gitster.g>
710 -
711 -
712 -* ab/build-gitweb (2022-06-28) 8 commits
713 - (merged to 'next' on 2022-07-11 at 731e354ff0)
714 - + gitweb/Makefile: add a "NO_GITWEB" parameter
715 - + Makefile: build 'gitweb' in the default target
716 - + gitweb/Makefile: include in top-level Makefile
717 - + gitweb: remove "test" and "test-installed" targets
718 - + gitweb/Makefile: prepare to merge into top-level Makefile
719 - + gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars
720 - + gitweb/Makefile: add a $(GITWEB_ALL) variable
721 - + gitweb/Makefile: define all .PHONY prerequisites inline
722 -
723 - Teach "make all" to build gitweb as well.
724 -
725 - Will merge to 'master'.
726 - source: <cover-v3-0.8-00000000000-20220628T100936Z-avarab@gmail.com>
727 -
728 -
729 -* ab/test-without-templates (2022-06-06) 7 commits
730 - (merged to 'next' on 2022-07-11 at afab6c1918)
731 - + tests: don't assume a .git/info for .git/info/sparse-checkout
732 - + tests: don't assume a .git/info for .git/info/exclude
733 - + tests: don't assume a .git/info for .git/info/refs
734 - + tests: don't assume a .git/info for .git/info/attributes
735 - + tests: don't assume a .git/info for .git/info/grafts
736 - + tests: don't depend on template-created .git/branches
737 - + t0008: don't rely on default ".git/info/exclude"
738 -
739 - Tweak tests so that they still work when the "git init" template
740 - did not create .git/info directory.
741 -
742 - Will merge to 'master'.
743 - source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>
744 -
745 -
776 * tb/show-ref-count (2022-06-06) 2 commits
777 - builtin/show-ref.c: limit output with `--count`
778 - builtin/show-ref.c: rename `found_match` to `matches_nr`