From: Junio C Hamano Date: Fri, 20 Aug 2021 17:45:28 +0000 (-0700) Subject: What's cooking (2021/08 #07) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e53be185f4410b2a55046b5ae2b1c95e17dd9dd5;p=thirdparty%2Fgit.git What's cooking (2021/08 #07) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 0072d55989..71d3269cd4 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Aug 2021, #06; Mon, 16) +Subject: What's cooking in git.git (Aug 2021, #07; Fri, 20) X-master-at: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf -X-next-at: 9b09ab0cd71e3176c74aab77531d8c6b18775e2d +X-next-at: c128427fd74129b5a9814d069c2d800d1d1e5021 -What's cooking in git.git (Aug 2021, #06; Mon, 16) +What's cooking in git.git (Aug 2021, #07; Fri, 20) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,7 +17,16 @@ useful"). Do not read too much into a topic being in (or not in) 'seen'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -Git 2.33 (final) has been tagged. +The tip of 'next' has not been rewound yet, but I've been instead +reverting a few topics out of it to prepare. + +Most notably, since the "errno cleanup around refs API" topics have +been blocking the "reftable backend" topic, I've reverted the former +out of 'next' and moved them to near the tip of 'seen', essentially +giving priority to the latter. In other words, I'd expect to see +that the "reftable" topic to move before the "errno cleanup" topic, +and also expect that any breakage, when both are merged to 'seen', +would be resolved by adjusting the "errno cleanup" topic. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some @@ -47,63 +56,15 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ --------------------------------------------------- -[Graduated to 'master'] - -* rs/oidtree-alignment-fix (2021-08-15) 1 commit - (merged to 'next' on 2021-08-15 at f03b174faa) - + oidtree: avoid unaligned access to crit-bit tree - - Codepath to access recently added oidtree data structure had - to make unaligned accesses to oids, which has been corrected. - -------------------------------------------------- [New Topics] -* ar/submodule-run-update-procedure (2021-08-13) 1 commit - - submodule--helper: run update procedures from C - - Reimplementation of parts of "git submodule" in C continues. - - -* cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit - - ci: use upload-artifacts v1 for dockerized jobs - - Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the - new version has a blocker bug for that architecture. - - Will merge to 'next'. - - -* pw/rebase-skip-final-fix (2021-08-13) 3 commits - - rebase --continue: remove .git/MERGE_MSG - - rebase --apply: restore some tests - - t3403: fix commit authorship - - Checking out all the paths from HEAD during the last conflicted - step in "git rebase" and continuing would cause the step to be - skipped (which is expected), but leaves MERGE_HEAD file behind in - $GIT_DIR and confuses the next "git commit", which has been - corrected. - - Will merge to 'next'. - - -* ab/help-autocorrect-prompt (2021-08-14) 1 commit - - help.c: help.autocorrect=prompt waits for user action - - The logic for auto-correction of misspelt subcommands learned to go - interactive when the help.autocorrect configuration variable is set - to true. +* sg/make-fix-ar-invocation (2021-08-19) 1 commit + - Makefile: remove archives before manipulating them with 'ar' -* pw/rebase-r-fixes (2021-08-15) 4 commits - - rebase -r: fix merge -c with a merge strategy - - rebase -r: don't write .git/MERGE_MSG when fast-forwarding - - rebase -i: Add another reword test - - rebase -r: make 'merge -c' behave like reword - - Various bugs in "git rebase -r" have been fixed. +* ti/tcsh-completion-regression-fix (2021-08-18) 1 commit + - completion: tcsh: Fix regression by drop of wrapper functions -------------------------------------------------- [Stalled] @@ -125,32 +86,20 @@ Release tarballs are available at: "git maintenance" scheduler learned to use systemd timers as a possible backend. - Waiting for reviews. - - -* fc/completion-updates (2021-06-07) 4 commits - - completion: bash: add correct suffix in variables - - completion: bash: fix for multiple dash commands - - completion: bash: fix for suboptions with value - - completion: bash: fix prefix detection in branch.* - - Command line completion updates. - Expecting a reroll. - cf. <60be6f7fa4435_db80d208f2@natae.notmuch> -* es/superproject-aware-submodules (2021-06-16) 5 commits - - SQUASH??? - - submodule: cache superproject gitdir during 'update' - - submodule: cache superproject gitdir during absorbgitdirs - - introduce submodule.superprojectGitDir cache +* es/superproject-aware-submodules (2021-08-19) 5 commits + - fixup! introduce submodule.superprojectGitDir record + - submodule: record superproject gitdir during 'update' + - submodule: record superproject gitdir during absorbgitdirs + - introduce submodule.superprojectGitDir record - t7400-submodule-basic: modernize inspect() helper A configuration variable in a submodule points at the location of the superproject it is bound to (RFC). - Waiting for reviews. + Looking good. * en/zdiff3 (2021-06-15) 2 commits @@ -186,6 +135,63 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] +* fc/completion-updates (2021-08-18) 4 commits + - completion: bash: add correct suffix in variables + - completion: bash: fix for multiple dash commands + - completion: bash: fix for suboptions with value + - completion: bash: fix prefix detection in branch.* + + Command line completion updates. + + Will merge to 'next'? + + +* ar/submodule-run-update-procedure (2021-08-13) 1 commit + - submodule--helper: run update procedures from C + + Reimplementation of parts of "git submodule" in C continues. + + +* cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit + - ci: use upload-artifacts v1 for dockerized jobs + + Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the + new version has a blocker bug for that architecture. + + Will merge to 'next'. + + +* pw/rebase-skip-final-fix (2021-08-13) 3 commits + - rebase --continue: remove .git/MERGE_MSG + - rebase --apply: restore some tests + - t3403: fix commit authorship + + Checking out all the paths from HEAD during the last conflicted + step in "git rebase" and continuing would cause the step to be + skipped (which is expected), but leaves MERGE_MSG file behind in + $GIT_DIR and confuses the next "git commit", which has been + corrected. + + Will merge to 'next'. + + +* ab/help-autocorrect-prompt (2021-08-14) 1 commit + - help.c: help.autocorrect=prompt waits for user action + + The logic for auto-correction of misspelt subcommands learned to go + interactive when the help.autocorrect configuration variable is set + to true. + + +* pw/rebase-r-fixes (2021-08-15) 4 commits + - rebase -r: fix merge -c with a merge strategy + - rebase -r: don't write .git/MERGE_MSG when fast-forwarding + - rebase -i: Add another reword test + - rebase -r: make 'merge -c' behave like reword + + Various bugs in "git rebase -r" have been fixed. + + * th/userdiff-more-java (2021-08-11) 1 commit - userdiff: improve java hunk header regex @@ -202,7 +208,7 @@ Release tarballs are available at: been updated. -* es/config-based-hooks (2021-08-11) 7 commits +* es/config-based-hooks (2021-08-19) 7 commits - hook: allow out-of-repo 'git hook' invocations - hook: include hooks from the config - hook: allow running non-native hooks @@ -215,8 +221,11 @@ Release tarballs are available at: Revamp the hooks subsystem to allow multiple of them to trigger upon the same event and control via the configuration variables. + Will merge to 'next'? + -* mk/clone-recurse-submodules (2021-08-14) 1 commit +* mk/clone-recurse-submodules (2021-08-18) 2 commits + - fixup! clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled - clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled After "git clone --recurse-submodules", all submodules are cloned @@ -225,6 +234,8 @@ Release tarballs are available at: configuration is set to true in a repository created by "clone" with "--recurse-submodules" option. + cf. <4103806f-6d88-2756-8853-7e16e56ad425@gmail.com> + * bc/t5607-avoid-broken-test-fail-prereqs (2021-08-11) 1 commit - t5607: avoid using prerequisites to select algorithm @@ -242,7 +253,7 @@ Release tarballs are available at: "git commit --fixup" now works with "--edit" again, after it was broken in v2.32. - Will merge to 'next'? + Will merge to 'next'. * tl/traverse-non-commits-rename (2021-08-12) 1 commit @@ -426,14 +437,15 @@ Release tarballs are available at: Build update. -* jk/refs-files-cleanup-cleanup (2021-08-06) 1 commit - (merged to 'next' on 2021-08-09 at 37b0b8c910) - + refs: drop unused "flags" parameter to lock_ref_oid_basic() - (this branch uses ab/refs-files-cleanup.) +* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit + - refs: drop unused "flags" parameter to lock_ref_oid_basic() + (this branch is used by hn/refs-errno-cleanup; uses ab/refs-files-cleanup.) Code cleanup. - Will cook in 'next'. + Kicked out of 'next', to give ab/refs/files-cleanup a clean restart. + I suspect that ab/refs-files-cleanup can fix its commit by + squashing it in, but I'll leave that to the owner of the topic. * en/merge-strategy-docs (2021-08-05) 10 commits @@ -676,11 +688,11 @@ Release tarballs are available at: Will cook in 'next'. -* hn/reftable (2021-08-16) 25 commits +* hn/reftable (2021-08-18) 25 commits - t1404: annotate test cases with REFFILES - t1401,t2011: parameterize HEAD.lock for REFFILES - t1301: document what needs to be done for reftable - - Add "test-tool dump-reftable" command. + - reftable: add "test-tool dump-reftable" command. - git-prompt: prepare for reftable refs backend - refs: RFC: Reftable support for git-core - reftable: add dump utility @@ -694,7 +706,7 @@ Release tarballs are available at: - reftable: write reftable files - reftable: a generic binary tree implementation - reftable: reading/writing blocks - - Provide zlib's uncompress2 from compat/zlib-compat.c + - compat: provide zlib's uncompress2 from compat/zlib-compat.c - reftable: (de)serialization for the polymorphic record type. - reftable: add blocksource, an abstraction for random access reads - reftable: utility functions @@ -706,22 +718,25 @@ Release tarballs are available at: The "reftable" backend for the refs API. -* ab/refs-files-cleanup (2021-08-02) 11 commits - (merged to 'next' on 2021-08-04 at 8ca0ef1b6e) - + refs/files: remove unused "errno != ENOTDIR" condition - + refs/files: remove unused "errno == EISDIR" code - + refs/files: remove unused "oid" in lock_ref_oid_basic() - + reflog expire: don't lock reflogs using previously seen OID - + refs/files: add a comment about refs_reflog_exists() call - + refs: make repo_dwim_log() accept a NULL oid - + refs/debug: re-indent argument list for "prepare" - + refs/files: remove unused "skip" in lock_raw_ref() too - + refs/files: remove unused "extras/skip" in lock_ref_oid_basic() - + refs/files: remove unused REF_DELETING in lock_ref_oid_basic() - + refs/packet: add missing BUG() invocations to reflog callbacks +* ab/refs-files-cleanup (2021-08-19) 11 commits + - refs/files: remove unused "errno != ENOTDIR" condition + - refs/files: remove unused "errno == EISDIR" code + - refs/files: remove unused "oid" in lock_ref_oid_basic() + - reflog expire: don't lock reflogs using previously seen OID + - refs/files: add a comment about refs_reflog_exists() call + - refs: make repo_dwim_log() accept a NULL oid + - refs/debug: re-indent argument list for "prepare" + - refs/files: remove unused "skip" in lock_raw_ref() too + - refs/files: remove unused "extras/skip" in lock_ref_oid_basic() + - refs/files: remove unused REF_DELETING in lock_ref_oid_basic() + - refs/packet: add missing BUG() invocations to reflog callbacks (this branch is used by hn/refs-errno-cleanup and jk/refs-files-cleanup-cleanup.) - Will cook in 'next'. + Kicked out of 'next', to give ab/refs/files-cleanup a clean restart. + + I suspect that jk/refs-files-cleanup-cleanup should be squashed + into the commits in this topic, but I'll leave that to the owner of + the topic. * en/pull-conflicting-options (2021-07-22) 8 commits @@ -917,24 +932,24 @@ Release tarballs are available at: Long-overdue correctness and performance update to "diff --color-moved" feature. - Will cook in 'next'. + Eject for reroll. + cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com> -* hn/refs-errno-cleanup (2021-08-02) 7 commits - (merged to 'next' on 2021-08-04 at 7fe3c31e7f) - + refs: make errno output explicit for refs_resolve_ref_unsafe - + refs: explicitly return failure_errno from parse_loose_ref_contents - + refs: add failure_errno to refs_read_raw_ref() signature - + refs: make errno output explicit for read_raw_ref_fn - + refs/files-backend: stop setting errno from lock_ref_oid_basic - + refs: remove EINVAL errno output from specification of read_raw_ref_fn - + refs file backend: move raceproof_create_file() here - (this branch uses ab/refs-files-cleanup.) +* hn/refs-errno-cleanup (2021-08-19) 7 commits + - refs: make errno output explicit for refs_resolve_ref_unsafe + - refs: explicitly return failure_errno from parse_loose_ref_contents + - refs: add failure_errno to refs_read_raw_ref() signature + - refs: make errno output explicit for read_raw_ref_fn + - refs/files-backend: stop setting errno from lock_ref_oid_basic + - refs: remove EINVAL errno output from specification of read_raw_ref_fn + - refs file backend: move raceproof_create_file() here + (this branch uses ab/refs-files-cleanup and jk/refs-files-cleanup-cleanup.) Futz with the way 'errno' is relied on in the refs API to carry the failure modes up the callchain. - Will cook in 'next'. + Kicked out of 'next', to give ab/refs/files-cleanup a clean restart. * ab/test-tool-cache-cleanup (2021-06-08) 4 commits @@ -1057,36 +1072,3 @@ Release tarballs are available at: actual types of an object better. Needs review. - --------------------------------------------------- -[Discarded] - -* ab/test-columns (2021-08-05) 3 commits - . test-lib.sh: use GIT_TEST_COLUMNS over COLUMNS - . test-lib-functions.sh: add a test_with_columns function - . test-lib-functions.sh: rename test_must_fail_acceptable() - - Shells that adjust COLUMNS (e.g. bash with checkwinsize shell - option), affect and break tests on progress meters and anything - that depends on term_columns(). An test-only environment variable - has been introduced as a workaround. - - Seems too involved for a last-minute fix. - cf. <20210804212825.GH23408@szeder.dev> - - -* cb/reftable-fixup (2021-08-02) 3 commits - . openbsd: allow reftable building with zlib 1.2.3 - . reftable: clarify zlib version dependency - . fixup! Provide zlib's uncompress2 from compat/zlib-compat.c - - Fix-up for hn/reftable topic (no longer applicable). - - -* bc/inactive-submodules (2021-07-02) 1 commit - . submodule: mark submodules with update=none as inactive - - Usability update for inactive submodules. - - Retracted for now. - cf.