@matheusbsbs / matheus-bagliano / commits / 58bd20f182

What's cooking (2022/02 #01)

Junio C Hamano committed Feb 3, 2022 at 17:19 UTC 58bd20f182ef40e62ca2b7183c8fa7cfda6ffde8
1 file changed +420 -105
whats-cooking.txt
+420 -105
@@ -1,16 +1,12 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Jan 2022, #07; Mon, 24)
4 -X-master-at: 89bece5c8c96f0b962cfc89e63f82d603fd60bed
5 -X-next-at: 8bbb082509e826de6735dfa02922cfc3d7ffb8bc
3 +Subject: What's cooking in git.git (Feb 2022, #01; Thu, 3)
4 +X-master-at: 5d01301f2b865aa8dba1654d3f447ce9d21db0b5
5 +X-next-at: 69c8d7142f0a3c3f513ac30b2a4a88fb47e1d1b1
6
7 -What's cooking in git.git (Jan 2022, #07; Mon, 24)
7 +What's cooking in git.git (Feb 2022, #01; Thu, 3)
8 --------------------------------------------------
9
10 -Git 2.35 final has been tagged. Let's wait for a few days to see if
11 -there are regressions that needs brown-paper-bag fixes before we
12 -start moving topics from 'next' to 'master' for the new cycle.
13 -
10 Here are the topics that have been cooking in my tree. Commits
11 prefixed with '+' are in 'next' (being in 'next' is a sign that a
12 topic is stable enough to be used and are candidate to be in a
@@ -22,6 +18,12 @@ useful"). Do not read too much into a topic being in (or not in)
18 'seen'. The ones marked with '.' do not appear in any of the
19 integration branches, but I am still holding onto them.
20
21 +Will merge a bunch of topics as the first batch in this cycle down
22 +to 'master' (aka 'main'), hopefully tomorrow.
23 +
24 +Many new topics have sketchy or even empty topic description in the
25 +list below; help to fill them in is very much appreciated ;-)
26 +
27 Copies of the source code to Git live in many repositories, and the
28 following is a list of the ones I push into or their mirrors. Some
29 repositories have only a subset of branches.
@@ -53,26 +55,303 @@ Release tarballs are available at:
55 --------------------------------------------------
56 [Graduated to 'master']
57
56 -* ab/checkout-branch-info-leakfix (2022-01-21) 1 commit
57 - (merged to 'next' on 2022-01-23 at 8bbb082509)
58 - + checkout: avoid BUG() when hitting a broken repository
58 +* en/keep-cwd (2022-01-26) 1 commit
59 + (merged to 'next' on 2022-01-26 at b2518a683c)
60 + + sequencer, stash: fix running from worktree subdir
61
60 - We added an unrelated sanity checking that leads to a BUG() while
61 - plugging a leak, which triggered in a repository with symrefs in
62 - the local branch namespace that point at a ref outside. Partially
63 - revert the change to avoid triggering the BUG().
64 - source: <xmqqbl04d1s9.fsf_-_@gitster.g>
62 + Fix a regression in 2.35 that roke the use of "rebase" and "stash"
63 + in a secondary worktree.
64 + source: <pull.1205.git.git.1643161426138.gitgitgadget@gmail.com>
65
66 --------------------------------------------------
67 [New Topics]
68
69 -* jc/mem-pool-alignment (2022-01-24) 1 commit
70 - - mem-pool: don't assume uintmax_t is aligned enough for all types
69 +* jt/clone-not-quite-empty (2022-01-26) 1 commit
70 + (merged to 'next' on 2022-01-26 at c3bb39676e)
71 + + clone: support unusual remote ref configurations
72
72 - Update the logic to compute alignment requirement for our mem-pool.
73 + Cloning from a repository that does not yet have any branches or
74 + tags but has other refs resulted in a "remote transport reported
75 + error", which has been corrected.
76 +
77 + Will merge to 'master'.
78 + source: <20220124180909.2437002-1-jonathantanmy@google.com>
79 +
80 +
81 +* ab/no-errno-from-resolve-ref-unsafe (2022-01-26) 2 commits
82 + - refs API: remove "failure_errno" from refs_resolve_ref_unsafe()
83 + - sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure
84 +
85 + Remaining code-clean-up.
86 +
87 + Will merge to 'next'.
88 + source: <cover-v4-0.2-00000000000-20220126T143427Z-avarab@gmail.com>
89 +
90 +
91 +* gh/doc-typos (2022-01-26) 2 commits
92 + - Documentation/config/pgp.txt: add missing apostrophe
93 + - Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>
94 +
95 + Typofix.
96 +
97 + Will merge to 'next'.
98 + source: <20220126121426.53799-1-greg@hurrell.net>
99 +
100 +
101 +* jc/doc-log-messages (2022-01-27) 3 commits
102 + - SubmittingPatches: explain why we care about log messages
103 + - CodingGuidelines: hint why we value clearly written log messages
104 + - SubmittingPatches: write problem statement in the log in the present tense
105 +
106 + Update the contributor-facing documents on proposed log messages.
107
108 Will merge to 'next'?
75 - source: <20220123203347.74869-1-jrtc27@jrtc27.com>
109 + source: <20220126234205.2923388-1-gitster@pobox.com>
110 +
111 +
112 +* en/fetch-negotiation-default-fix (2022-02-02) 3 commits
113 + - repo-settings: rename the traditional default fetch.negotiationAlgorithm
114 + - repo-settings: fix error handling for unknown values
115 + - repo-settings: fix checking for fetch.negotiationAlgorithm=default
116 +
117 + Fix interaction between fetch.negotiationAlgorithm and
118 + feature.experimental configuration variables.
119 +
120 + Will merge to 'next'.
121 + source: <pull.1131.v4.git.1643773361.gitgitgadget@gmail.com>
122 +
123 +
124 +* en/sparse-checkout-leakfix (2022-01-28) 1 commit
125 + - sparse-checkout: fix a couple minor memory leaks
126 +
127 + Leakfix.
128 +
129 + Will merge to 'next'.
130 + source: <pull.1189.git.git.1643335098710.gitgitgadget@gmail.com>
131 +
132 +
133 +* js/diff-filter-negation-fix (2022-01-28) 3 commits
134 + - diff-filter: be more careful when looking for negative bits
135 + - diff.c: move the diff filter bits definitions up a bit
136 + - docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
137 +
138 + "git diff --diff-filter=aR" is now parsed correctly.
139 +
140 + Will merge to 'next'.
141 + source: <pull.1127.v3.git.1643371370.gitgitgadget@gmail.com>
142 +
143 +
144 +* js/no-more-legacy-stash (2022-01-27) 4 commits
145 + - stash: stop warning about the obsolete `stash.useBuiltin` config setting
146 + - stash: remove documentation for `stash.useBuiltin`
147 + - add: remove support for `git-legacy-stash`
148 + - git-sh-setup: remove remnant bits referring to `git-legacy-stash`
149 +
150 + Removal of unused code and doc.
151 +
152 + Will merge to 'next'.
153 + source: <pull.1133.git.1643321031.gitgitgadget@gmail.com>
154 +
155 +
156 +* js/scalar-global-options (2022-01-28) 1 commit
157 + - scalar: accept -C and -c options before the subcommand
158 +
159 + Scalar update.
160 +
161 + Will merge to 'next'.
162 + source: <pull.1130.v2.git.1643380317358.gitgitgadget@gmail.com>
163 +
164 +
165 +* rc/negotiate-only-typofix (2022-01-28) 1 commit
166 + - fetch: fix negotiate-only error message
167 +
168 + Typofix.
169 +
170 + Will merge to 'next'.
171 + source: <20220128143602.31842-1-robert@coup.net.nz>
172 +
173 +
174 +* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
175 + - receive-pack: check if client is alive before completing the push
176 +
177 + "git push" may be killed by the user when the server side has
178 + finished receiving all data and is about to commit the result.
179 + Give the latter a better chance to notice such situation and abort
180 + processing the ref updates.
181 +
182 + Will merge to 'next'?
183 + source: <20220128194811.3396281-1-robin.jarry@6wind.com>
184 +
185 +
186 +* jz/patch-id-hunk-header-parsing-fix (2022-02-02) 2 commits
187 + - patch-id: fix scan_hunk_header on diffs with 1 line of before/after
188 + - patch-id: fix antipatterns in tests
189 +
190 + Unlike "git apply", "git patch-id" did not handle patches with
191 + hunks that has only 1 line in either preimage or postimage, which
192 + has been corrected.
193 +
194 + Will merge to 'next'.
195 + source: <20220202041945.10077-1-jerry@skydio.com>
196 + source: <20220202042015.10115-1-jerry@skydio.com>
197 +
198 +
199 +* tg/fetch-prune-exit-code-fix (2022-01-31) 1 commit
200 + - fetch --prune: exit with error if pruning fails
201 +
202 + When "git fetch --prune" failed to prune the refs it wanted to
203 + prune, the command issued error messages but exited with exit
204 + status 0, which has been corrected.
205 +
206 + Will merge to 'next'.
207 + source: <20220131133047.1885074-1-t.gummerer@gmail.com>
208 +
209 +
210 +* ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit
211 + - perl Git.pm: don't ignore signalled failure in _cmd_close()
212 +
213 + Git.pm update.
214 +
215 + Will merge to 'next'.
216 + source: <patch-1.1-86353c3b366-20220201T205218Z-avarab@gmail.com>
217 +
218 +
219 +* ab/object-file-api-updates (2022-02-01) 10 commits
220 + - object-file API: pass an enum to read_object_with_reference()
221 + - object-file.c: add a literal version of write_object_file_prepare()
222 + - object-file API: replace check_object_signature() with stream_*
223 + - object-file API: have hash_object_file() take "enum object_type"
224 + - object-file API: replace some use of check_object_signature()
225 + - object-file API: provide a hash_object_file_oideq()
226 + - object-file API: have write_object_file() take "enum object_type"
227 + - object-file API: add a format_object_header() function
228 + - object-file API: return "void", not "int" from hash_object_file()
229 + - object-file.c: split up declaration of unrelated variables
230 +
231 + source: <cover-00.10-00000000000-20220201T144803Z-avarab@gmail.com>
232 +
233 +
234 +* cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit
235 + - receive-pack: purge temporary data if no command is ready to run
236 +
237 + Check if "receive-pack" will do any ref updates (various conditions
238 + could reject a push) before received objects are taken out of the
239 + temporary directory used for quarantine purposes, so that a push
240 + that is known-to-fail will not leave crufts that a future "gc"
241 + needs to clean up.
242 +
243 + Will merge to 'next'?
244 + source: <20220129063538.24038-1-bojun.cbj@gmail.com>
245 +
246 +
247 +* hn/reftable-tests (2022-01-31) 3 commits
248 + - t5312: prepare for reftable
249 + - t1405: mark test that checks existence as REFFILES
250 + - t1405: explictly delete reflogs for reftable
251 +
252 + Prepare more test scripts for the introduction of reftable.
253 +
254 + Will merge to 'next'.
255 + source: <pull.1209.git.git.1643651420.gitgitgadget@gmail.com>
256 +
257 +
258 +* ja/i18n-common-messages (2022-01-31) 5 commits
259 + - i18n: fix some misformated placeholders in command synopsis
260 + - i18n: remove from i18n strings that do not hold translatable parts
261 + - i18n: factorize "invalid value" messages
262 + - SQUASH???
263 + - i18n: factorize more 'incompatible options' messages
264 +
265 + Unify more messages to help l10n.
266 +
267 + Will merge to 'next' after squashing the fix-up in.
268 + source: <pull.1123.v4.git.1643666870.gitgitgadget@gmail.com>
269 +
270 +
271 +* tk/subtree-merge-not-ff-only (2022-02-01) 1 commit
272 + - subtree: force merge commit
273 +
274 + When "git subtree" wants to create a merge, it used "git merge" and
275 + let it be affected by end-user's "merge.ff" configuration, which
276 + has been corrected.
277 +
278 + Will merge to 'next'.
279 + source: <20220201172601.262718-1-aclopte@gmail.com>
280 +
281 +
282 +* ab/complete-show-all-commands (2022-02-02) 2 commits
283 + - completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS
284 + - completion tests: re-source git-completion.bash in a subshell
285 +
286 + The command line completion script (in contrib/) learns an option
287 + to complete all Git subcommands, including the ones that are
288 + normally hidden.
289 +
290 + Will merge to 'next'.
291 + source: <cover-v2-0.2-00000000000-20220202T111228Z-avarab@gmail.com>
292 +
293 +
294 +* en/merge-tree (2022-02-02) 16 commits
295 + - git-merge-tree.txt: add a section on potentional usage mistakes
296 + - merge-tree: add a --allow-unrelated-histories flag
297 + - merge-tree: allow `ls-files -u` style info to be NUL terminated
298 + - merge-tree: provide easy access to `ls-files -u` style info
299 + - merge-tree: provide a list of which files have conflicts
300 + - merge-ort: provide a merge_get_conflicted_files() helper function
301 + - merge-tree: support including merge messages in output
302 + - merge-ort: allow update messages to be written to different file stream
303 + - merge-ort: split out a separate display_update_messages() function
304 + - diff: allow diff_warn_rename_limit to write somewhere besides stderr
305 + - Introduce a variant of the `warning()` function that takes a `FILE *`
306 + - merge-tree: implement real merges
307 + - merge-tree: add option parsing and initial shell for real merge function
308 + - merge-tree: move logic for existing merge into new function
309 + - merge-tree: rename merge_trees() to trivial_merge_trees()
310 + - Merge branch 'en/remerge-diff' into en/merge-trees
311 + (this branch uses en/remerge-diff.)
312 +
313 + A new command is introduced that takes two commits and computes a
314 + tree that would be contained in the resulting merge commit, if the
315 + histories leading to these two commits were to be merged, and is
316 + added as a new mode of "git merge-tree" subcommand.
317 +
318 + source: <pull.1122.v3.git.1643787281.gitgitgadget@gmail.com>
319 +
320 +
321 +* ll/doc-mktree-typofix (2022-02-02) 1 commit
322 + - fix typo in git-mktree.txt
323 +
324 + Typofix.
325 +
326 + Will merge to 'next'.
327 + source: <pull.1207.git.git.1643792450866.gitgitgadget@gmail.com>
328 +
329 +* po/doc-check-ignore-markup-fix (2022-02-03) 1 commit
330 + - doc: check-ignore: code-quote an exclamation mark
331 +
332 + Typofix.
333 +
334 + Will merge to 'next'.
335 + source: <20220203101643.1987-1-philipoakley@iee.email>
336 +
337 +
338 +* sy/diff-usage-typofix (2022-02-02) 1 commit
339 + - builtin/diff.c: fix "git-diff" usage string typo
340 +
341 + Typofix.
342 +
343 + Will merge to 'next'.
344 + source: <20220202072844.35545-1-shaoxuan.yuan02@gmail.com>
345 +
346 +
347 +* sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits
348 + - t/lib-read-tree-m-3way: indent with tabs
349 + - t/lib-read-tree-m-3way: modernize style
350 +
351 + Style updates on a test script helper.
352 +
353 + Will merge to 'next'.
354 + source: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>
355
356 --------------------------------------------------
357 [Stalled]
@@ -107,43 +386,51 @@ Release tarballs are available at:
386 source: <20211202035446.1154-1-carenas@gmail.com>
387
388
110 -* ar/submodule-update (2021-10-13) 9 commits
111 - . submodule--helper: rename helper functions
112 - . submodule--helper: remove unused helpers
389 +* ar/submodule-update (2022-01-28) 9 commits
390 . submodule: move core cmd_update() logic to C
391 + . submodule tests: test for init and update failure output
392 + . submodule--helper: don't use bitfield indirection for parse_options()
393 + . builtin/submodule--helper.c: rename option variables to "opt"
394 + . builtin/submodule--helper.c: reformat designated initializers
395 . submodule--helper: run update using child process struct
396 . submodule--helper: allow setting superprefix for init_submodule()
397 . submodule--helper: refactor get_submodule_displaypath()
117 - . submodule--helper: rename helpers for update-clone
398 . submodule--helper: get remote names from any repository
119 - . submodule--helper: split up ensure_core_worktree()
399
400 Rewrite of "git submodule update" in C.
122 -
123 - Expecting a reroll?
124 - cf. <YWiXL+plA7GHfuVv@google.com>
125 - source: <20211013051805.45662-10-raykar.ath@gmail.com>
401 + source: <cover-v5-0.9-00000000000-20220128T125206Z-avarab@gmail.com>
402
403 --------------------------------------------------
404 [Cooking]
405
130 -* ab/auto-detect-zlib-compress2 (2022-01-24) 1 commit
406 +* jc/mem-pool-alignment (2022-01-24) 1 commit
407 + (merged to 'next' on 2022-01-26 at 057b6a78f5)
408 + + mem-pool: don't assume uintmax_t is aligned enough for all types
409 +
410 + Update the logic to compute alignment requirement for our mem-pool.
411 +
412 + Will merge to 'master'.
413 + source: <20220123203347.74869-1-jrtc27@jrtc27.com>
414 +
415 +
416 +* ab/auto-detect-zlib-compress2 (2022-01-26) 1 commit
417 - compat: auto-detect if zlib has uncompress2()
418
419 Notice older zlib to enable our replacement uncompress2()
420 automatically.
421
136 - Will merge to 'next'?
422 + Will merge to 'next'.
423 source: <xmqqr18x3s5s.fsf@gitster.g>
424
425
426 * en/plug-leaks-in-merge (2022-01-21) 2 commits
141 - - merge: fix memory leaks in cmd_merge()
142 - - merge-ort: fix memory leak in merge_ort_internal()
427 + (merged to 'next' on 2022-01-26 at 0cf6aa0a2b)
428 + + merge: fix memory leaks in cmd_merge()
429 + + merge-ort: fix memory leak in merge_ort_internal()
430
431 Leakfix.
432
146 - Will merge to 'next'.
433 + Will merge to 'master'.
434 source: <pull.1200.git.git.1642664835.gitgitgadget@gmail.com>
435
436
@@ -153,18 +440,24 @@ Release tarballs are available at:
440 "git clone --filter=... --recurse-submodules" only makes the
441 top-level a partial clone, while submodules are fully cloned. This
442 behaviour is changed to pass the same filter down to the submodules.
443 +
444 + It is unclear passing all filters down is a good idea. It
445 + definitely is contrary to the project norm to flip the default
446 + instead of starting the new behaviour as an optional behaviour.
447 + cf. <xmqqsftgbkvm.fsf@gitster.g>
448 source: <50ebf7bd39adf34fa4ada27cd433d81b5381abe5.1642735881.git.steadmon@google.com>
449
450
451 * js/sparse-vs-split-index (2022-01-23) 3 commits
160 - - split-index: it really is incompatible with the sparse index
161 - - t1091: disable split index
162 - - sparse-index: sparse index is disallowed when split index is active
452 + (merged to 'next' on 2022-01-26 at 7443487955)
453 + + split-index: it really is incompatible with the sparse index
454 + + t1091: disable split index
455 + + sparse-index: sparse index is disallowed when split index is active
456
457 Mark in various places in the code that the sparse index and the
458 split index features are mutually incompatible.
459
167 - Will merge to 'next'.
460 + Will merge to 'master'.
461 source: <pull.1119.git.1642613379.gitgitgadget@gmail.com>
462
463
@@ -175,18 +468,19 @@ Release tarballs are available at:
468 Avoid tests that are run under GIT_TRACE2 set from failing
469 unnecessarily.
470
178 - Will cook in 'next'.
471 + Will merge to 'master'.
472 source: <82e51a52e20fbe13a5a898a0a2f6dbe1188e3fa3.1642116539.git.steadmon@google.com>
473
474
475 * jt/sparse-checkout-leading-dir-fix (2022-01-21) 1 commit
183 - - sparse-checkout: create leading directory
476 + (merged to 'next' on 2022-01-26 at 5611ce9047)
477 + + sparse-checkout: create leading directory
478
479 "git sparse-checkout init" failed to write into $GIT_DIR/info
480 directory when the repository was created without one, which has
481 been corrected to auto-create it.
482
189 - Will merge to 'next'.
483 + Will merge to 'master'.
484 source: <20220121174441.3991963-1-jonathantanmy@google.com>
485
486
@@ -194,6 +488,8 @@ Release tarballs are available at:
488 - parse-options: document bracketing of argh
489
490 Comment update.
491 +
492 + Will merge to 'next'.
493 source: <c6ab4408-1091-4d14-849e-afe5f3053e8b@web.de>
494
495
@@ -204,7 +500,7 @@ Release tarballs are available at:
500 The merge-ort misbehaved when merge.renameLimit configuration is
501 set too low and failed to find all renames.
502
207 - Will cook in 'next'.
503 + Will merge to 'master'.
504 source: <pull.1194.v2.git.git.1642443955836.gitgitgadget@gmail.com>
505
506
@@ -246,7 +542,7 @@ Release tarballs are available at:
542
543 Doc update.
544
249 - Will cook in 'next'.
545 + Will merge to 'master'.
546 source: <pull.1115.v3.git.1642443491609.gitgitgadget@gmail.com>
547
548
@@ -258,7 +554,7 @@ Release tarballs are available at:
554 line arguments, but did not spell out that dashed options come
555 before other args, which has been corrected.
556
261 - Will cook in 'next'.
557 + Will merge to 'master'.
558 source: <fe748304d94e0ae25fd3549aadc49cf951ff2d64.1642405806.git.dyroneteng@gmail.com>
559
560
@@ -268,25 +564,27 @@ Release tarballs are available at:
564 - bisect--helper: release strbuf and strvec on run error
565 - bisect--helper: report actual bisect_state() argument on error
566
567 + A not-so-common mistake is to write a script to feed "git bisect
568 + run" without making it executable, in which case all tests will
569 + exit with 126 or 127 error codes, even on revisions that are marked
570 + as good. Try to recoginse this situation and stop iteration early.
571 +
572 + Will merge to 'next'?
573 source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
574
575
274 -* ds/sparse-checkout-requires-per-worktree-config (2022-01-14) 6 commits
275 - . worktree: copy sparse-checkout patterns and config on add
276 - . sparse-checkout: use repo_config_set_worktree_gently()
277 - . config: add repo_config_set_worktree_gently()
278 - . worktree: add 'init-worktree-config' subcommand
279 - . config: make some helpers repo-aware
280 - . setup: use a repository when upgrading format
576 +* ds/sparse-checkout-requires-per-worktree-config (2022-01-31) 5 commits
577 + - worktree: copy sparse-checkout patterns and config on add
578 + - sparse-checkout: set worktree-config correctly
579 + - config: add repo_config_set_worktree_gently()
580 + - worktree: create init_worktree_config()
581 + - Documentation: add extensions.worktreeConfig details
582
583 "git sparse-checkout" wants to work with per-worktree configration,
584 but did not work well in a worktree attached to a bare repository.
585
285 - Expecting an update.
286 - cf. <1db0f601-4769-15c0-cd58-ecddfa1fc9d5@gmail.com>
287 - Introduces new leaks.
288 - cf. https://github.com/git/git/runs/4823667255?check_suite_focus=true
289 - source: <pull.1101.v3.git.1640727143.gitgitgadget@gmail.com>
586 + What's the doneness of this one?
587 + source: <pull.1101.v5.git.1643641259.gitgitgadget@gmail.com>
588
589
590 * pw/add-p-hunk-split-fix (2022-01-12) 2 commits
@@ -297,7 +595,7 @@ Release tarballs are available at:
595 "git add -p" rewritten in C regressed hunk splitting in some cases,
596 which has been corrected.
597
300 - Will cook in 'next'.
598 + Will merge to 'master'.
599 source: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com>
600
601
@@ -316,7 +614,7 @@ Release tarballs are available at:
614 should trigger "gc". The code has been tightened up to ensure it
615 only does common ancestry discovery and nothing else.
616
319 - Will cook in 'next'.
617 + Will merge to 'master'.
618 source: <20220119000056.58503-1-chooglen@google.com>
619
620
@@ -325,7 +623,7 @@ Release tarballs are available at:
623 + git-p4: fix instantiation of CalledProcessError
624 (this branch is used by jh/p4-various-fixups.)
625
328 - Will cook in 'next'.
626 + Will merge to 'master'.
627 source: <20220106214156.90967-1-jholdsworth@nvidia.com>
628
629
@@ -336,7 +634,7 @@ Release tarballs are available at:
634 + git-p4: don't select shell mode using the type of the command argument
635 (this branch is used by jh/p4-various-fixups.)
636
339 - Will cook in 'next'.
637 + Will merge to 'master'.
638 source: <20220106214035.90725-1-jholdsworth@nvidia.com>
639
640
@@ -348,7 +646,7 @@ Release tarballs are available at:
646 variable when the remote history is a descendant of our history,
647 which has been corrected.
648
351 - Will cook in 'next'.
649 + Will merge to 'master'.
650 source: <xmqqr19aayxp.fsf@gitster.g>
651
652
@@ -361,7 +659,7 @@ Release tarballs are available at:
659
660 Code clean-up.
661
364 - Will cook in 'next'.
662 + Will merge to 'master'.
663 source: <cover.1641498525.git.me@ttaylorr.com>
664
665
@@ -372,7 +670,7 @@ Release tarballs are available at:
670 The code path that verifies signatures made with ssh were made to
671 work better on a system with CRLF line endings.
672
375 - Will cook in 'next'.
673 + Will merge to 'master'.
674 source: <20220107090735.580225-1-fs@gigacodes.de>
675
676
@@ -385,7 +683,7 @@ Release tarballs are available at:
683 alignment requirement of data being sorted in compatibility
684 implementation of qsort_s() and stable qsort().
685
388 - Will cook in 'next'.
686 + Will merge to 'master'.
687 source: <f40c1b47-9aad-2dcc-ceeb-5dee2b517cd8@web.de>
688 source: <xmqqzgo76xpj.fsf@gitster.g>
689
@@ -403,7 +701,7 @@ Release tarballs are available at:
701 that logically removes one ref may end up invoking ref-transaction
702 hook twice, which has been corrected.
703
406 - Introduces new leaks when merged to 'seen'.
704 + Will merge to 'next'?
705 source: <cover.1642406989.git.ps@pks.im>
706
707
@@ -415,18 +713,20 @@ Release tarballs are available at:
713 track of how each symbolic link needs to be handled, which has been
714 simplified by using strset.
715
418 - Will cook in 'next'.
716 + Will merge to 'master'.
717 source: <8739caad-aa3d-1f0f-b5dd-6174a8e059f6@web.de>
718
719
422 -* ld/sparse-index-bash-completion (2022-01-10) 3 commits
423 - - sparse-checkout: limit tab completion to a single level
424 - - sparse-checkout: custom tab completion
425 - - sparse-checkout: custom tab completion tests
720 +* ld/sparse-index-bash-completion (2022-02-03) 3 commits
721 + . completion: handle unusual characters for sparse-checkout
722 + . completion: improve sparse-checkout cone mode directory completion
723 + . completion: address sparse-checkout issues
724
725 The command line completion (in contrib/) learns to complete
726 arguments give to "git sparse-checkout" command.
429 - source: <pull.1108.v3.git.1641841193.gitgitgadget@gmail.com>
727 +
728 + Seems to break CI.
729 + source: <pull.1108.v5.git.1643921091.gitgitgadget@gmail.com>
730
731
732 * bc/clarify-eol-attr (2022-01-12) 2 commits
@@ -434,6 +734,8 @@ Release tarballs are available at:
734 - t0027: add tests for eol without text in .gitattributes
735
736 Doc and test update around the eol attribute.
737 +
738 + Will merge to 'next'.
739 source: <20220111021507.531736-1-sandals@crustytoothpaste.net>
740
741
@@ -444,6 +746,8 @@ Release tarballs are available at:
746 to propagate UNINTERESTING bit down only along the first-parent
747 chain, just like --first-parent option shows commits that lack the
748 UNINTERESTING bit only along the first-parent chain.
749 +
750 + Will merge to 'next'.
751 source: <20220111213941.30129-1-jerry@skydio.com>
752
753
@@ -460,6 +764,8 @@ Release tarballs are available at:
764 could lead to later problems. Such files were hard to discover, and
765 harder to correct. Automatically detecting and correcting the marking
766 of such files has been added to avoid these problems.
767 +
768 + Will merge to 'next'?
769 source: <pull.1114.v2.git.1642175983.gitgitgadget@gmail.com>
770
771
@@ -470,6 +776,7 @@ Release tarballs are available at:
776 Pick a better random number generator and use it when we prepare
777 temporary filenames.
778
779 + Will merge to 'next'?
780 Are we solving the right problem?
781 cf. <220118.86zgntpegy.gmgdl@evledraar.gmail.com>
782 source: <20220117215617.843190-1-sandals@crustytoothpaste.net>
@@ -482,7 +789,7 @@ Release tarballs are available at:
789
790 Use the parse-options API in "git reflog" command.
791
485 - Will cook in 'next'.
792 + Will merge to 'master'.
793 source: <pull.1175.v5.git.git.1641495981650.gitgitgadget@gmail.com>
794
795
@@ -500,6 +807,8 @@ Release tarballs are available at:
807
808 "git update-index", "git checkout-index", and "git clean" are
809 taught to work better with the sparse checkout feature.
810 +
811 + Will merge to 'next'.
812 source: <pull.1109.v2.git.1641924306.gitgitgadget@gmail.com>
813
814
@@ -513,7 +822,7 @@ Release tarballs are available at:
822 "git update-index --refresh" has been taught to deal better with
823 racy timestamps (just like "git status" already does).
824
516 - Will cook in 'next'.
825 + Will merge to 'master'.
826 source: <pull.1105.v4.git.1641554252.gitgitgadget@gmail.com>
827
828
@@ -523,7 +832,7 @@ Release tarballs are available at:
832
833 Code clean-up.
834
526 - Will cook in 'next'.
835 + Will merge to 'master'.
836 source: <pull.1125.v6.git.git.1641499655700.gitgitgadget@gmail.com>
837
838
@@ -535,11 +844,11 @@ Release tarballs are available at:
844 "git name-rev --stdin" does not behave like usual "--stdin" at
845 all. Start the process of renaming it to "--annotate-stdin".
846
538 - Will cook in 'next'.
847 + Will merge to 'master'.
848 source: <pull.1171.v7.git.git.1641425372.gitgitgadget@gmail.com>
849
850
542 -* en/remerge-diff (2022-01-21) 11 commits
851 +* en/remerge-diff (2022-02-02) 11 commits
852 - diff-merges: avoid history simplifications when diffing merges
853 - merge-ort: mark conflict/warning messages from inner merges as omittable
854 - show, log: include conflict/warning messages in --remerge-diff headers
@@ -551,12 +860,13 @@ Release tarballs are available at:
860 - log: clean unneeded objects during `log --remerge-diff`
861 - show, log: provide a --remerge-diff capability
862 - Merge branch 'ns/tmp-objdir' into en/remerge-diff
863 + (this branch is used by en/merge-tree.)
864
865 "git log --remerge-diff" shows the difference from mechanical merge
866 result and the merge result that is actually recorded.
867
868 Will merge to 'next'?
559 - source: <pull.1103.v4.git.1642792341.gitgitgadget@gmail.com>
869 + source: <pull.1103.v5.git.1643769457.gitgitgadget@gmail.com>
870
871
872 * bs/forbid-i18n-of-protocol-token-in-fetch-pack (2021-12-22) 2 commits
@@ -569,9 +879,10 @@ Release tarballs are available at:
879 source: <20211222075805.19027-1-bagasdotme@gmail.com>
880
881
572 -* gc/branch-recurse-submodules (2022-01-10) 6 commits
882 +* gc/branch-recurse-submodules (2022-02-01) 7 commits
883 + - branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks
884 - branch: add --recurse-submodules option for branch creation
574 - - builtin/branch: clean up action-picking logic in cmd_branch()
885 + - builtin/branch: consolidate action-picking logic in cmd_branch()
886 - branch: add a dry_run parameter to create_branch()
887 - branch: make create_branch() always create a branch
888 - branch: move --set-upstream-to behavior to dwim_and_setup_tracking()
@@ -579,9 +890,8 @@ Release tarballs are available at:
890
891 "git branch" learned the "--recurse-submodules" option.
892
582 - Expecting a reroll.
583 - cf. <kl6l7db6kvp2.fsf@chooglen-macbookpro.roam.corp.google.com>
584 - source: <20211220233459.45739-1-chooglen@google.com>
893 + Will merge to 'next'.
894 + source: <20220129000446.99261-1-chooglen@google.com>
895
896
897 * hn/reftable-coverity-fixes (2022-01-20) 17 commits
@@ -610,7 +920,7 @@ Release tarballs are available at:
920 source: <pull.1152.v6.git.git.1642691534.gitgitgadget@gmail.com>
921
922
613 -* tb/midx-bitmap-corruption-fix (2022-01-04) 9 commits
923 +* tb/midx-bitmap-corruption-fix (2022-01-27) 9 commits
924 - pack-bitmap.c: gracefully fallback after opening pack/MIDX
925 - midx: read `RIDX` chunk when present
926 - t/lib-bitmap.sh: parameterize tests over reverse index source
@@ -624,20 +934,19 @@ Release tarballs are available at:
934 A bug that made multi-pack bitmap and the object order out-of-sync
935 (hence the .midx data gets corrupted) has been fixed.
936
627 - Waiting for a hopefully final review.
628 - cf. <Ydceeo33Yt4N%2FbrN@nand.local>
629 - source: <cover.1641320129.git.me@ttaylorr.com>
937 + Will merge to 'next'.
938 + source: <cover.1643150456.git.me@ttaylorr.com>
939
940
632 -* pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits
941 +* pw/fix-some-issues-in-reset-head (2022-01-26) 14 commits
942 - rebase -m: don't fork git checkout
943 - rebase --apply: set ORIG_HEAD correctly
944 - rebase --apply: fix reflog
945 - reset_head(): take struct rebase_head_opts
946 - rebase: cleanup reset_head() calls
947 + - create_autostash(): remove unneeded parameter
948 - reset_head(): make default_reflog_action optional
949 - reset_head(): factor out ref updates
640 - - create_autostash(): remove unneeded parameter
950 - reset_head(): remove action parameter
951 - rebase --apply: don't run post-checkout hook if there is an error
952 - rebase: do not remove untracked files on checkout
@@ -645,15 +954,14 @@ Release tarballs are available at:
954 - t5403: refactor rebase post-checkout hook tests
955 - rebase: factor out checkout for up to date branch
956
648 - Fix "some issues" in a helper function reset_head().
957 + Use an internal call to reset_head() helper function instead of
958 + spawning "git checkout" in "rebase", and update code paths that are
959 + involved in the change.
960
650 - Expecting a reroll.
651 - cf. <xmqqk0gdskkh.fsf@gitster.g>
652 - cf. <xmqqwnkdr3xb.fsf@gitster.g>
653 - cf. <xmqqpmq5r3j9.fsf@gitster.g>
654 - cf. <xmqqczm5r34h.fsf@gitster.g>
655 - cf. <CABPp-BEHW4VLG18twcM_8iOco1jZ2iuGT+KN8aS+-sAAnBhTnw@mail.gmail.com>
656 - source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>
961 + Will merge to 'next'?
962 + May want to rename the topic branch to "pw/use-in-process-checkout-in-rebase"
963 + or something before doing so.
964 + source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
965
966
967 * ab/cat-file (2022-01-12) 12 commits
@@ -674,13 +982,13 @@ Release tarballs are available at:
982
983 Assorted updates to "git cat-file", especially "-h".
984
677 - Will cook in 'next'.
985 + Will merge to 'master'.
986 source: <cover-v6-00.10-00000000000-20211228T132637Z-avarab@gmail.com>
987 source: <cover-0.2-00000000000-20220110T220553Z-avarab@gmail.com>
988
989
682 -* ab/grep-patterntype (2022-01-18) 10 commits
683 - - grep.[ch]: remove GREP_PATTERN_TYPE_UNSPECIFIED
990 +* ab/grep-patterntype (2022-01-27) 10 commits
991 + - SQUASH???
992 - grep: simplify config parsing and option parsing
993 - grep.c: do "if (bool && memchr())" not "if (memchr() && bool)"
994 - grep.h: make "grep_opt.pattern_type_option" use its enum
@@ -693,8 +1001,10 @@ Release tarballs are available at:
1001
1002 Some code clean-up in the "git grep" machinery.
1003
696 - Looking good, except for the last two steps.
697 - source: <cover-v8-00.10-00000000000-20220118T155211Z-avarab@gmail.com>
1004 + Looking good, except for the last step.
1005 + Code-wise, it is tempted to call it a victory after squashing the
1006 + fix-up in, but that does not fix the proposed log message, so...
1007 + source: <cover-v9-0.9-00000000000-20220127T115058Z-avarab@gmail.com>
1008
1009
1010 * js/use-builtin-add-i (2021-12-01) 2 commits
@@ -720,21 +1030,24 @@ Release tarballs are available at:
1030 "[includeIf <condition>]" learns to base its decision on the
1031 URL of the remote repository the repository interacts with.
1032
723 - Will cook in 'next'.
1033 + Will merge to 'master'.
1034 source: <cover.1642527965.git.jonathantanmy@google.com>
1035
1036
727 -* ab/ambiguous-object-name (2022-01-13) 6 commits
1037 +* ab/ambiguous-object-name (2022-01-27) 7 commits
1038 - object-name: re-use "struct strbuf" in show_ambiguous_object()
1039 - object-name: iterate ambiguous objects before showing header
1040 - object-name: show date for ambiguous tag objects
1041 - object-name: make ambiguous object output translatable
1042 + - object-name: explicitly handle bad tags in show_ambiguous_object()
1043 - object-name: explicitly handle OBJ_BAD in show_ambiguous_object()
1044 - object-name tests: add tests for ambiguous object blind spots
1045
1046 Error output given in response to an ambiguous object name has been
1047 improved.
737 - source: <cover-v7-0.6-00000000000-20220111T130811Z-avarab@gmail.com>
1048 +
1049 + What's the doneness of this thing?
1050 + source: <cover-v8-0.7-00000000000-20220127T052116Z-avarab@gmail.com>
1051
1052
1053 * tl/ls-tree-oid-only (2022-01-13) 9 commits
@@ -750,6 +1063,8 @@ Release tarballs are available at:
1063
1064 "git ls-tree" learns "--oid-only" option, similar to "--name-only",
1065 and more generalized "--format" option.
1066 +
1067 + Will merge to 'next'?
1068 source: <cover.1641978175.git.dyroneteng@gmail.com>
1069
1070
@@ -775,7 +1090,7 @@ Release tarballs are available at:
1090
1091 More "config-based hooks".
1092
778 - Will cook in 'next'.
1093 + Will merge to 'master'.
1094 source: <cover-v6-00.17-00000000000-20211222T035755Z-avarab@gmail.com>
1095
1096