From: Junio C Hamano Date: Mon, 27 Jun 2022 17:10:24 +0000 (-0700) Subject: What's cooking (2022/06 #08) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f2441c521622b8cc3517f0996abce55b072d949;p=thirdparty%2Fgit.git What's cooking (2022/06 #08) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 617cd6b617..2fc183e1db 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jun 2022, #07; Wed, 22) -X-master-at: f770e9f396d48b567ef7b37d273e91ad570a3522 -X-next-at: 5c70b8d9af74545ad2b62bd035c293f139c02a5c +Subject: What's cooking in git.git (Jun 2022, #08; Mon, 27) +X-master-at: e4a4b31577c7419497ac30cebe30d755b97752c5 +X-next-at: 69fb8171204c8e773da4dd0a0988641096be0b42 -What's cooking in git.git (Jun 2022, #07; Wed, 22) +What's cooking in git.git (Jun 2022, #08; Mon, 27) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -13,7 +13,7 @@ topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. -Git 2.37-rc2 has been tagged. +Git 2.37 (final) has been tagged. 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 @@ -43,16 +43,136 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ +-------------------------------------------------- +[Graduated to 'master'] + +* ab/credentials-in-url-more (2022-06-23) 1 commit + (merged to 'next' on 2022-06-23 at 11d700111c) + + Documentation/config/transfer.txt: fix typo + + Typofix. + source: <68c1c3648c51f6298eea4d58286b20e0c770a270.1656010900.git.me@ttaylorr.com> + + +* jc/revert-show-parent-info (2022-06-27) 1 commit + (merged to 'next' on 2022-06-27 at 9a7cc59c69) + + revert: config documentation fixes + + Typofix. + source: <6727daf1-f077-7319-187e-ab4e55de3b2d@web.de> + -------------------------------------------------- [New Topics] +* ab/squelch-empty-fsync-traces (2022-06-23) 1 commit + - trace2: don't include "fsync" events in all trace2 logs + + Omit fsync-related trace2 entries when their values are all zero. + + Expecting a reroll. + cf. + source: + + +* cl/grep-max-count (2022-06-22) 1 commit + - grep: add --max-count command line option + + "git grep -m" is a way to limit the hits shown per file. + + Will merge to 'next'. + source: + + +* jk/revisions-doc-markup-fix (2022-06-22) 1 commit + - revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis + + Documentation mark-up fix. + + Will merge to 'next'. + source: + + +* tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit + - rev-parse: documentation adjustment - mention remote tracking with @{u} + + Doc update. + + Will merge to 'next'. + source: + +-------------------------------------------------- +[Stalled] + +* bc/stash-export (2022-04-08) 4 commits + - builtin/stash: provide a way to import stashes from a ref + - builtin/stash: provide a way to export stashes to a ref + - builtin/stash: factor out revision parsing into a function + - object-name: make get_oid quietly return an error + + A mechanism to export and import stash entries to and from a normal + commit to transfer it across repositories has been introduced. + + Expecting a reroll. + cf. + source: <20220407215352.3491567-1-sandals@crustytoothpaste.net> + + +* cw/remote-object-info (2022-05-06) 11 commits + - SQUASH??? coccicheck + - SQUASH??? ensure that coccicheck is happy + - SQUASH??? compilation fix + - cat-file: add --batch-command remote-object-info command + - cat-file: move parse_cmd and DEFAULT_FORMAT up + - transport: add object-info fallback to fetch + - transport: add client side capability to request object-info + - object-info: send attribute packet regardless of object ids + - object-store: add function to free object_info contents + - fetch-pack: move fetch default settings + - fetch-pack: refactor packet writing + + A client component to talk with the object-info endpoint. + + Expecting a reroll. + source: <20220502170904.2770649-1-calvinwan@google.com> + +-------------------------------------------------- +[Cooking] + +* en/merge-tree (2022-06-22) 17 commits + - git-merge-tree.txt: add a section on potentional usage mistakes + - merge-tree: add a --allow-unrelated-histories flag + - merge-tree: allow `ls-files -u` style info to be NUL terminated + - merge-ort: optionally produce machine-readable output + - merge-ort: store more specific conflict information + - merge-ort: make `path_messages` a strmap to a string_list + - merge-ort: store messages in a list, not in a single strbuf + - merge-tree: provide easy access to `ls-files -u` style info + - merge-tree: provide a list of which files have conflicts + - merge-ort: remove command-line-centric submodule message from merge-ort + - merge-ort: provide a merge_get_conflicted_files() helper function + - merge-tree: support including merge messages in output + - merge-ort: split out a separate display_update_messages() function + - merge-tree: implement real merges + - merge-tree: add option parsing and initial shell for real merge function + - merge-tree: move logic for existing merge into new function + - merge-tree: rename merge_trees() to trivial_merge_trees() + + A new command is introduced that takes two commits and computes a + tree that would be contained in the resulting merge commit, if the + histories leading to these two commits were to be merged, and is + added as a new mode of "git merge-tree" subcommand. + + Will merge to 'next'. + source: + + * dr/i18n-die-warn-error-usage (2022-06-21) 1 commit - i18n: mark message helpers prefix for translation Give _() markings to fatal/warning/usage: that is shown in front of these messages. - Will merge to 'next'? + Will merge to 'next'. source: @@ -86,7 +206,7 @@ Release tarballs are available at: Certain diff options are currently ignored when combined-diff is shown; mark them as incompatible with the feature. - Will merge to 'next'? + Will merge to 'next'. source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com> @@ -102,13 +222,14 @@ Release tarballs are available at: source: -* zh/ls-files-format (2022-06-21) 1 commit +* zh/ls-files-format (2022-06-27) 1 commit - ls-files: introduce "--format" option "git ls-files" learns the "--format" option to tweak its output. - Needs review. - source: + Expecting a reroll. + cf. + source: * ab/test-quoting-fix (2022-06-21) 3 commits @@ -134,88 +255,6 @@ Release tarballs are available at: Needs review. source: --------------------------------------------------- -[Graduated to 'master'] - -* jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits - (merged to 'next' on 2022-06-15 at e580db03e9) - + git-prompt: fix expansion of branch colour codes - (merged to 'next' on 2022-06-08 at 201a84ad63) - + git-prompt: make colourization consistent - - Bash command line prompt (in contrib/) update. - source: <20220607115024.64724-1-joak-pet@online.no> - - -* tb/cruft-packs (2022-06-21) 1 commit - (merged to 'next' on 2022-06-21 at 0703251124) - + gc: simplify --cruft description - - Docfix. - source: <157741e2-cd06-9304-bb21-c67c2cbd923e@web.de> - --------------------------------------------------- -[Stalled] - -* en/merge-tree (2022-02-23) 13 commits - - git-merge-tree.txt: add a section on potentional usage mistakes - - merge-tree: add a --allow-unrelated-histories flag - - merge-tree: allow `ls-files -u` style info to be NUL terminated - - merge-tree: provide easy access to `ls-files -u` style info - - merge-tree: provide a list of which files have conflicts - - merge-ort: provide a merge_get_conflicted_files() helper function - - merge-tree: support including merge messages in output - - merge-ort: split out a separate display_update_messages() function - - merge-tree: implement real merges - - merge-tree: add option parsing and initial shell for real merge function - - merge-tree: move logic for existing merge into new function - - merge-tree: rename merge_trees() to trivial_merge_trees() - - Merge branch 'en/remerge-diff' into en/merge-trees - - A new command is introduced that takes two commits and computes a - tree that would be contained in the resulting merge commit, if the - histories leading to these two commits were to be merged, and is - added as a new mode of "git merge-tree" subcommand. - - On hold. - cf. - source: - - -* bc/stash-export (2022-04-08) 4 commits - - builtin/stash: provide a way to import stashes from a ref - - builtin/stash: provide a way to export stashes to a ref - - builtin/stash: factor out revision parsing into a function - - object-name: make get_oid quietly return an error - - A mechanism to export and import stash entries to and from a normal - commit to transfer it across repositories has been introduced. - - Expecting a reroll. - cf. - source: <20220407215352.3491567-1-sandals@crustytoothpaste.net> - - -* cw/remote-object-info (2022-05-06) 11 commits - - SQUASH??? coccicheck - - SQUASH??? ensure that coccicheck is happy - - SQUASH??? compilation fix - - cat-file: add --batch-command remote-object-info command - - cat-file: move parse_cmd and DEFAULT_FORMAT up - - transport: add object-info fallback to fetch - - transport: add client side capability to request object-info - - object-info: send attribute packet regardless of object ids - - object-store: add function to free object_info contents - - fetch-pack: move fetch default settings - - fetch-pack: refactor packet writing - - A client component to talk with the object-info endpoint. - - Expecting a reroll. - source: <20220502170904.2770649-1-calvinwan@google.com> - --------------------------------------------------- -[Cooking] * cr/setup-bug-typo (2022-06-17) 1 commit (merged to 'next' on 2022-06-17 at 8834ffe0ab) @@ -235,7 +274,7 @@ Release tarballs are available at: bitmaps. The push.useBitmaps configuration variable is introduced to allow disabling use of reachability bitmaps only for "git push". - Will merge to 'next'? + Will merge to 'next'. source: @@ -246,13 +285,14 @@ Release tarballs are available at: "git remote show [-n] frotz" now pays attention to negative pathspecs. - Will merge to 'next'? + Will merge to 'next'. source: <20220617002036.1577-2-jacob.keller@gmail.com> * js/commit-graph-parsing-without-repo-settings (2022-06-15) 1 commit - commit-graph: refactor to avoid prepare_repo_settings + Expecting a reroll. source: <9b56496b0809cc8a25af877ea97042e2cb7f2af6.1655246092.git.steadmon@google.com> @@ -273,7 +313,7 @@ Release tarballs are available at: "git mktree --missing" lazily fetched objects that are missing from the local object store, which was totally unnecessary. - Will merge to 'next'? + Will merge to 'next'. source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com> @@ -342,7 +382,7 @@ Release tarballs are available at: source: <20220610195247.1177549-1-jonathantanmy@google.com> -* gc/submodule-update (2022-06-15) 12 commits +* ab/submodule-cleanup (2022-06-15) 12 commits - git-sh-setup.sh: remove "say" function, change last users - git-submodule.sh: use "$quiet", not "$GIT_QUIET" - submodule--helper: eliminate internal "--update" option @@ -356,9 +396,9 @@ Release tarballs are available at: - git-submodule.sh: remove unused $prefix var and --super-prefix - git-submodule.sh: remove unused sanitize_submodule_env() - More work on "git submodule update". + Further preparation to turn git-submodule.sh into a builtin. - Needs review. + Will merge to 'next'? source: @@ -429,7 +469,7 @@ Release tarballs are available at: loose object file straight, without having to keep it in-core as a whole. - Will merge to 'next'? + Will merge to 'next'. source: @@ -525,26 +565,3 @@ Release tarballs are available at: Thoughts? source: <20220422083629.1404989-1-hi@alyssa.is> - --------------------------------------------------- -[Discarded] - -* jc/apply-icase-tests (2022-06-13) 1 commit - . t4141: test "git apply" with core.ignorecase - - Now a part of tk/apply-case-insensitive topic. - source: - - -* tl/pack-bitmap-trace (2022-06-21) 5 commits - . bitmap: add trace2 outputs during open "bitmap" file - . pack-bitmap.c: using error() instead of silently returning -1 - . pack-bitmap.c: make warnings support i18N when opening bitmap - . pack-bitmap.c: rename "idx_name" to "bitmap_name" - . pack-bitmap.c: continue looping when first MIDX bitmap is found - - Add trace2 traces in code paths involving the pack bitmaps. - - source: - -