From: Junio C Hamano Date: Mon, 24 Jan 2022 18:32:19 +0000 (-0800) Subject: What's cooking (2022/01 #07) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4401f32e03452483690f57132bdea0d1486272d6;p=thirdparty%2Fgit.git What's cooking (2022/01 #07) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 2890b3d749..0ea50e2465 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,35 +1,15 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jan 2022, #06; Fri, 21) -X-master-at: 297ca895a27a6bbdb7906371d533f72a12ad25b2 -X-next-at: 9bf600f5edf4beea0ee980660bdc5ff523e7b5c5 +Subject: What's cooking in git.git (Jan 2022, #07; Mon, 24) +X-master-at: 89bece5c8c96f0b962cfc89e63f82d603fd60bed +X-next-at: 8bbb082509e826de6735dfa02922cfc3d7ffb8bc -What's cooking in git.git (Jan 2022, #06; Fri, 21) +What's cooking in git.git (Jan 2022, #07; Mon, 24) -------------------------------------------------- -Possibly a few more last-minute fixes may want to be on 'master' -before the final: - - - ab/checkout-branch-info-leakfix is to stop "git checkout -f - " from triggering BUG() when is a symbolic ref that - points at a strange place. - - - en/merge-ort-restart-optim-fix is to avoid triggering assertion - failure when merge.renameLimit is set to a value that is too low. - - - js/test-unset-trace2-parents is to help those developers who run - "make test" inside a git that is being traced via GIT_TRACE2 - mechanism. - - - ab/auto-detect-zlib-compress2 is to automate use of replacement - uncompress2() implementation on platforms with zlib that is too - old. - - - pb/pull-rebase-autostash-fix is to fix the remaining case where - "git pull --rebase" that reused the merge machinery when the - update can be fast-forwarded did not behave well. - -but we can probably do without many of them in the worst case. +Git 2.35 final has been tagged. Let's wait for a few days to see if +there are regressions that needs brown-paper-bag fixes before we +start moving topics from 'next' to 'master' for the new cycle. Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a @@ -71,29 +51,91 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[New Topics] - -* ab/auto-detect-zlib-compress2 (2022-01-21) 1 commit - - cache.h: auto-detect if zlib has uncompress2() - - Notice older zlib to enable our replacement uncompress2() - automatically. - - Will merge to 'next'. - source: - +[Graduated to 'master'] * ab/checkout-branch-info-leakfix (2022-01-21) 1 commit - - checkout: avoid BUG() when hitting a broken repository + (merged to 'next' on 2022-01-23 at 8bbb082509) + + checkout: avoid BUG() when hitting a broken repository We added an unrelated sanity checking that leads to a BUG() while plugging a leak, which triggered in a repository with symrefs in the local branch namespace that point at a ref outside. Partially revert the change to avoid triggering the BUG(). - - Will merge to 'next' and then to 'master'? source: +-------------------------------------------------- +[New Topics] + +* jc/mem-pool-alignment (2022-01-24) 1 commit + - mem-pool: don't assume uintmax_t is aligned enough for all types + + Update the logic to compute alignment requirement for our mem-pool. + + Will merge to 'next'? + source: <20220123203347.74869-1-jrtc27@jrtc27.com> + +-------------------------------------------------- +[Stalled] + +* je/http-better-error-output (2021-12-03) 1 commit + . http-backend: give a hint that web browser access is not supported + + When the http-backend program, which is the server-side component + for the smart HTTP transport, sends a "404 Not found" error, we + deliberately did not say anything to the requesting client. We now + send a message back to the browser to tell the user that they do + not want to visit the URL via their browser, instead of a totally + blank page. + + Expecting a reroll. + Breaks its self tests. + cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr> + source: <20211202102855.23907-1-jengelh@inai.de> + + +* cb/save-term-across-editor-invocation (2021-12-01) 3 commits + - fixup! editor: allow for saving/restoring terminal state + - editor: allow for saving/restoring terminal state + - terminal: teach save_term to fail when not foreground + + Some editors are reported to leave the terminal in funny state + after they exit on Windows. Work it around by saving and restoring + the terminal state when needed. + + Expecting a reroll. + cf. + source: <20211202035446.1154-1-carenas@gmail.com> + + +* ar/submodule-update (2021-10-13) 9 commits + . submodule--helper: rename helper functions + . submodule--helper: remove unused helpers + . submodule: move core cmd_update() logic to C + . submodule--helper: run update using child process struct + . submodule--helper: allow setting superprefix for init_submodule() + . submodule--helper: refactor get_submodule_displaypath() + . submodule--helper: rename helpers for update-clone + . submodule--helper: get remote names from any repository + . submodule--helper: split up ensure_core_worktree() + + Rewrite of "git submodule update" in C. + + Expecting a reroll? + cf. + source: <20211013051805.45662-10-raykar.ath@gmail.com> + +-------------------------------------------------- +[Cooking] + +* ab/auto-detect-zlib-compress2 (2022-01-24) 1 commit + - compat: auto-detect if zlib has uncompress2() + + Notice older zlib to enable our replacement uncompress2() + automatically. + + Will merge to 'next'? + source: + * en/plug-leaks-in-merge (2022-01-21) 2 commits - merge: fix memory leaks in cmd_merge() @@ -111,11 +153,10 @@ Release tarballs are available at: "git clone --filter=... --recurse-submodules" only makes the top-level a partial clone, while submodules are fully cloned. This behaviour is changed to pass the same filter down to the submodules. - source: <50ebf7bd39adf34fa4ada27cd433d81b5381abe5.1642735881.git.steadmon@google.com> -* js/sparse-vs-split-index (2022-01-21) 3 commits +* js/sparse-vs-split-index (2022-01-23) 3 commits - split-index: it really is incompatible with the sparse index - t1091: disable split index - sparse-index: sparse index is disallowed when split index is active @@ -123,6 +164,7 @@ Release tarballs are available at: Mark in various places in the code that the sparse index and the split index features are mutually incompatible. + Will merge to 'next'. source: @@ -152,61 +194,8 @@ Release tarballs are available at: - parse-options: document bracketing of argh Comment update. - source: --------------------------------------------------- -[Stalled] - -* je/http-better-error-output (2021-12-03) 1 commit - . http-backend: give a hint that web browser access is not supported - - When the http-backend program, which is the server-side component - for the smart HTTP transport, sends a "404 Not found" error, we - deliberately did not say anything to the requesting client. We now - send a message back to the browser to tell the user that they do - not want to visit the URL via their browser, instead of a totally - blank page. - - Expecting a reroll. - Breaks its self tests. - cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr> - source: <20211202102855.23907-1-jengelh@inai.de> - - -* cb/save-term-across-editor-invocation (2021-12-01) 3 commits - - fixup! editor: allow for saving/restoring terminal state - - editor: allow for saving/restoring terminal state - - terminal: teach save_term to fail when not foreground - - Some editors are reported to leave the terminal in funny state - after they exit on Windows. Work it around by saving and restoring - the terminal state when needed. - - Expecting a reroll. - cf. - source: <20211202035446.1154-1-carenas@gmail.com> - - -* ar/submodule-update (2021-10-13) 9 commits - . submodule--helper: rename helper functions - . submodule--helper: remove unused helpers - . submodule: move core cmd_update() logic to C - . submodule--helper: run update using child process struct - . submodule--helper: allow setting superprefix for init_submodule() - . submodule--helper: refactor get_submodule_displaypath() - . submodule--helper: rename helpers for update-clone - . submodule--helper: get remote names from any repository - . submodule--helper: split up ensure_core_worktree() - - Rewrite of "git submodule update" in C. - - Expecting a reroll? - cf. - source: <20211013051805.45662-10-raykar.ath@gmail.com> - --------------------------------------------------- -[Cooking] * en/merge-ort-restart-optim-fix (2022-01-17) 1 commit (merged to 'next' on 2022-01-19 at 84da10b057)