diff --git a/whats-cooking.txt b/whats-cooking.txt index 31ee9c13697..49503e32703 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 (Jul 2022, #01; Fri, 1) -X-master-at: e4a4b31577c7419497ac30cebe30d755b97752c5 -X-next-at: 8ac04bfd244e0d302aaeb6ab241eb092dcf6a733 +Subject: What's cooking in git.git (Jul 2022, #02; Fri, 8) +X-master-at: 30cc8d0f147546d4dd77bf497f4dec51e7265bd8 +X-next-at: cef32db0b66f484ee602159300027f9396ab5473 -What's cooking in git.git (Jul 2022, #01; Fri, 1) +What's cooking in git.git (Jul 2022, #02; Fri, 8) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -12,12 +12,6 @@ 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 final was released, many in the northan hemisphere are -about to be in summer vacation week. We probably will have a small -update 2.37.1 near mid July to deal with a small "regression" in -2.37 but otherwise things are expected to be slow, and slow is good -;-) - 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 repositories have only a subset of branches. @@ -49,38 +43,108 @@ Release tarballs are available at: -------------------------------------------------- [New Topics] -* ds/git-rebase-doc-markup (2022-06-30) 1 commit - - git-rebase.txt: use back-ticks consistently +* ab/cocci-unused (2022-07-06) 6 commits + - cocci: generalize "unused" rule to cover more than "strbuf" + - cocci: add and apply a rule to find "unused" strbufs + - cocci: have "coccicheck{,-pending}" depend on "coccicheck-test" + - cocci: add a "coccicheck-test" target and test *.cocci rules + - Makefile & .gitignore: ignore & clean "git.res", not "*.res" + - Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS - Correct "git rebase" documentation mark-up. + Add Coccinelle rules to detect the pattern of initializing and then + finalizing a structure without using it in between at all, which + happens after code restructuring and the compilers fail to + recognize as an unused varilable. Will merge to 'next'. - source: + source: -* ds/rebase-update-ref (2022-06-28) 8 commits - - rebase: add rebase.updateRefs config option - - rebase: update refs from 'update-ref' commands - - rebase: add --update-refs option - - sequencer: add update-ref command - - sequencer: define array with enum values - - rebase-interactive: update 'merge' description - - branch: consider refs under 'update-refs' - - t2407: test branches currently using apply backend - (this branch uses ds/branch-checked-out.) +* jk/clone-unborn-confusion (2022-07-07) 3 commits + - clone: use remote branch if it matches default HEAD + - clone: propagate empty remote HEAD even with other branches + - clone: drop extra newline from warning message - "git rebase -i" learns to update branches whose tip appear in the - rebased range. + "git clone" from a repository with some ref whose HEAD is unborn + did not set the HEAD in the resulting repository correctly, which + has been corrected. Will merge to 'next'? - source: + source: -* ds/vscode-settings (2022-06-27) 1 commit - - vscode: improve tab size and wrapping +* ac/bitmap-lookup-table (2022-07-06) 6 commits + - p5310-pack-bitmaps.sh: remove pack.writeReverseIndex + - bitmap-lookup-table: add performance tests for lookup table + - pack-bitmap: prepare to read lookup table extension + - pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests + - pack-bitmap-write.c: write lookup table extension + - Documentation/technical: describe bitmap lookup table extension - source: + The pack bitmap file gained a bitmap-lookup table to speed up + locating the necessary bitmap for a given commit. + Will merge to 'next'? + source: + + +* bc/nettle-sha256 (2022-07-07) 1 commit + - sha256: add support for Nettle + + Support for libnettle as SHA256 implementation has been added. + + Expecting a reroll. + cf. + source: <20220705230518.713218-1-sandals@crustytoothpaste.net> + + +* jc/builtin-mv-move-array (2022-07-06) 1 commit + - builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove() + + Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp + macro, which would improve maintainability and readability. + + Will merge to 'next'? + source: + + +* jd/gpg-interface-trust-level-string (2022-07-08) 1 commit + - gpg-interface: add function for converting trust level to string + + The code to convert between GPG trust level strings and internal + constants we use to represent them have been cleaned up. + + Will merge to 'next'. + source: + + +* kk/p4-client-name-encoding-fix (2022-07-08) 1 commit + - git-p4: fix bug with encoding of p4 client name + + "git p4" did not handle non-ASCII client name well, which has been + corrected. + + Will merge to 'next'. + source: + + +* sa/cat-file-mailmap (2022-07-07) 5 commits + - SQUASH??? + - cat-file: add mailmap support + - ident: rename commit_rewrite_person() to apply_mailmap_to_header() + - ident: move commit_rewrite_person() to ident.c + - revision: improve commit_rewrite_person() + + source: <20220707161554.6900-1-siddharthasthana31@gmail.com> + + +* fr/vimdiff-layout-fix (2022-07-08) 1 commit + - vimdiff: make layout engine more robust against user vim settings + + source: <20220708181024.45839-1-greenfoo@u92.eu> + +-------------------------------------------------- +[Graduated to 'master'] * js/add-i-delete (2022-06-28) 1 commit (merged to 'next' on 2022-06-28 at 8ac04bfd24) @@ -88,133 +152,18 @@ Release tarballs are available at: Rewrite of "git add -i" in C that appeared in Git 2.25 didn't correctly record a removed file to the index, which was fixed. - - Will merge to 'master'. source: - -* tb/pack-objects-remove-pahole-comment (2022-06-28) 1 commit - - pack-objects.h: remove outdated pahole results - - Comment fix. - - Will merge to 'next'. - source: <1379af2e9d271b501ef3942398e7f159a9c77973.1656440978.git.me@ttaylorr.com> - - -* ab/leakfix (2022-07-01) 11 commits - - pull: fix a "struct oid_array" memory leak - - cat-file: fix a common "struct object_context" memory leak - - gc: fix a memory leak - - checkout: avoid "struct unpack_trees_options" leak - - merge-file: fix memory leaks on error path - - merge-file: refactor for subsequent memory leak fix - - cat-file: fix a memory leak in --batch-command mode - - revert: free "struct replay_opts" members - - submodule.c: free() memory from xgetcwd() - - clone: fix memory leak in wanted_peer_refs() - - check-ref-format: fix trivial memory leak - - Plug various memory leaks. - - source: - - -* ab/test-tool-leakfix (2022-07-01) 9 commits - - test-tool delta: fix a memory leak - - test-tool ref-store: fix a memory leak - - test-tool bloom: fix memory leaks - - test-tool json-writer: fix memory leaks - - test-tool regex: call regfree(), fix memory leaks - - test-tool urlmatch-normalization: fix a memory leak - - test-tool {dump,scrap}-cache-tree: fix memory leaks - - test-tool path-utils: fix a memory leak - - test-tool test-hash: fix a memory leak - - Plug various memory leaks in test-tool commands. - - source: - - -* en/t6429-test-must-be-empty-fix (2022-06-30) 1 commit - - t6429: fix use of non-existent function - - A test fix. - - Will merge to 'next'. - source: - - -* gc/submodule-use-super-prefix (2022-06-30) 8 commits - - submodule--helper: remove display path helper - - submodule--helper update: use --super-prefix - - submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags - - submodule--helper: use correct display path helper - - submodule--helper: don't recreate recursive prefix - - submodule--helper update: use display path helper - - submodule--helper tests: add missing "display path" coverage - - Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix - (this branch uses ab/submodule-cleanup.) - - Another step to rewrite more parts of "git submodule" in C. - - Will merge to 'next'? - source: <20220701021157.88858-1-chooglen@google.com> - - -* hx/lookup-commit-in-graph-fix (2022-06-30) 1 commit - - commit-graph.c: no lazy fetch in lookup_commit_in_graph() - - A corner case bug where lazily fetching objects from a promisor - remote resulted in infinite recursion has been corrected. - - Will merge to 'next'. - source: <96d4bb71505d87ed501c058bbd89bfc13d08b24a.1656593279.git.hanxin.hx@bytedance.com> - - -* ll/ls-files-tests-update (2022-07-01) 1 commit - - ls-files: update test style - - Test update. - - Will merge to 'next'. - source: - - -* pw/xdiff-alloc (2022-06-30) 3 commits - - xdiff: introduce XDL_ALLOC_GROW() - - xdiff: introduce XDL_CALLOC_ARRAY() - - xdiff: introduce XDL_ALLOC_ARRAY() - - Add a level of redirection to array allocation API in xdiff part, - to make it easier to share with the libgit2 project. - - Waiting for review responses. - source: - - -* sy/mv-out-of-cone (2022-07-01) 8 commits - - mv: add check_dir_in_index() and solve general dir check issue - - mv: use flags mode for update_mode - - mv: check if exists in index to handle overwriting - - mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit - - mv: decouple if/else-if checks using goto - - mv: update sparsity after moving from out-of-cone to in-cone - - t1092: mv directory from out-of-cone to in-cone - - t7002: add tests for moving out-of-cone file/directory - - "git mv A B" in a sparsely populated working tree can be asked to - move a path between directories that are "in cone" (i.e. expected - to be materialized in the working tree) and "out of cone" - (i.e. expected to be hidden). The handling of such cases has been - improved. - - Will merge to 'next'. - source: <20220630023737.473690-1-shaoxuan.yuan02@gmail.com> - -------------------------------------------------- [Stalled] +* ll/curl-accept-language (2022-06-13) 2 commits + - PREP??? give initializer to rpc_state + - remote-curl: send Accept-Language header to server + + 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 @@ -250,6 +199,172 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] +* ds/git-rebase-doc-markup (2022-06-30) 1 commit + (merged to 'next' on 2022-07-08 at 24a0b80b71) + + git-rebase.txt: use back-ticks consistently + + References to commands-to-be-typed-literally in "git rebase" + documentation mark-up have been corrected. + + Will merge to 'master'. + source: + + +* ds/rebase-update-ref (2022-06-28) 8 commits + - rebase: add rebase.updateRefs config option + - rebase: update refs from 'update-ref' commands + - rebase: add --update-refs option + - sequencer: add update-ref command + - sequencer: define array with enum values + - rebase-interactive: update 'merge' description + - branch: consider refs under 'update-refs' + - t2407: test branches currently using apply backend + (this branch uses ds/branch-checked-out.) + + "git rebase -i" learns to update branches whose tip appear in the + rebased range. + + Expecting a reroll. + cf. <15631ea2-6722-fd24-c8a6-0cee638b0602@github.com> + source: + + +* ds/vscode-settings (2022-06-27) 1 commit + (merged to 'next' on 2022-07-02 at fcbd2e7aca) + + vscode: improve tab size and wrapping + + Will merge to 'master'. + source: + + +* tb/pack-objects-remove-pahole-comment (2022-06-28) 1 commit + (merged to 'next' on 2022-07-06 at d7494fbdef) + + pack-objects.h: remove outdated pahole results + + Comment fix. + + Will merge to 'master'. + source: <1379af2e9d271b501ef3942398e7f159a9c77973.1656440978.git.me@ttaylorr.com> + + +* ab/leakfix (2022-07-01) 11 commits + - pull: fix a "struct oid_array" memory leak + - cat-file: fix a common "struct object_context" memory leak + - gc: fix a memory leak + - checkout: avoid "struct unpack_trees_options" leak + - merge-file: fix memory leaks on error path + - merge-file: refactor for subsequent memory leak fix + - cat-file: fix a memory leak in --batch-command mode + - revert: free "struct replay_opts" members + - submodule.c: free() memory from xgetcwd() + - clone: fix memory leak in wanted_peer_refs() + - check-ref-format: fix trivial memory leak + + Plug various memory leaks. + + Will merge to 'next'. + source: + + +* ab/test-tool-leakfix (2022-07-01) 9 commits + - test-tool delta: fix a memory leak + - test-tool ref-store: fix a memory leak + - test-tool bloom: fix memory leaks + - test-tool json-writer: fix memory leaks + - test-tool regex: call regfree(), fix memory leaks + - test-tool urlmatch-normalization: fix a memory leak + - test-tool {dump,scrap}-cache-tree: fix memory leaks + - test-tool path-utils: fix a memory leak + - test-tool test-hash: fix a memory leak + + Plug various memory leaks in test-tool commands. + + Will merge to 'next'. + source: + + +* en/t6429-test-must-be-empty-fix (2022-06-30) 1 commit + (merged to 'next' on 2022-07-06 at 627c51773c) + + t6429: fix use of non-existent function + + A test fix. + + Will merge to 'master'. + source: + + +* gc/submodule-use-super-prefix (2022-06-30) 8 commits + - submodule--helper: remove display path helper + - submodule--helper update: use --super-prefix + - submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags + - submodule--helper: use correct display path helper + - submodule--helper: don't recreate recursive prefix + - submodule--helper update: use display path helper + - submodule--helper tests: add missing "display path" coverage + - Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix + (this branch uses ab/submodule-cleanup.) + + Another step to rewrite more parts of "git submodule" in C. + + Will merge to 'next'. + source: <20220701021157.88858-1-chooglen@google.com> + + +* hx/lookup-commit-in-graph-fix (2022-06-30) 1 commit + (merged to 'next' on 2022-07-08 at cef32db0b6) + + commit-graph.c: no lazy fetch in lookup_commit_in_graph() + + A corner case bug where lazily fetching objects from a promisor + remote resulted in infinite recursion has been corrected. + + Will merge to 'master'. + source: <96d4bb71505d87ed501c058bbd89bfc13d08b24a.1656593279.git.hanxin.hx@bytedance.com> + + +* ll/ls-files-tests-update (2022-07-06) 1 commit + (merged to 'next' on 2022-07-06 at 444d1eabd0) + + ls-files: update test style + + Test update. + + Will merge to 'master'. + source: + + +* pw/xdiff-alloc (2022-07-08) 4 commits + - xdiff: introduce XDL_ALLOC_GROW() + - xdiff: introduce XDL_CALLOC_ARRAY() + - xdiff: introduce xdl_calloc + - xdiff: introduce XDL_ALLOC_ARRAY() + + Add a level of redirection to array allocation API in xdiff part, + to make it easier to share with the libgit2 project. + + Will merge to 'next'? + source: + + +* sy/mv-out-of-cone (2022-07-01) 8 commits + (merged to 'next' on 2022-07-08 at 654970fdb7) + + mv: add check_dir_in_index() and solve general dir check issue + + mv: use flags mode for update_mode + + mv: check if exists in index to handle overwriting + + mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit + + mv: decouple if/else-if checks using goto + + mv: update sparsity after moving from out-of-cone to in-cone + + t1092: mv directory from out-of-cone to in-cone + + t7002: add tests for moving out-of-cone file/directory + + "git mv A B" in a sparsely populated working tree can be asked to + move a path between directories that are "in cone" (i.e. expected + to be materialized in the working tree) and "out of cone" + (i.e. expected to be hidden). The handling of such cases has been + improved. + + Will merge to 'master'. + source: <20220630023737.473690-1-shaoxuan.yuan02@gmail.com> + + * ab/squelch-empty-fsync-traces (2022-06-30) 1 commit . trace2: don't include "fsync" events in all trace2 logs @@ -260,74 +375,82 @@ Release tarballs are available at: * cl/grep-max-count (2022-06-22) 1 commit - - grep: add --max-count command line option + (merged to 'next' on 2022-07-08 at 646199ab4c) + + grep: add --max-count command line option "git grep -m" is a way to limit the hits shown per file. - Will merge to 'next'. + Will merge to 'master'. source: * jk/revisions-doc-markup-fix (2022-06-22) 1 commit - - revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis + (merged to 'next' on 2022-07-02 at e25dbe8cfb) + + revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis Documentation mark-up fix. - Will merge to 'next'. + Will merge to 'master'. source: * tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit - - rev-parse: documentation adjustment - mention remote tracking with @{u} + (merged to 'next' on 2022-07-08 at 1075452f32) + + rev-parse: documentation adjustment - mention remote tracking with @{u} Doc update. - Will merge to 'next'. + Will merge to 'master'. source: * 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() + (merged to 'next' on 2022-07-08 at a29b4896ab) + + 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'. + Will merge to 'master'. source: * dr/i18n-die-warn-error-usage (2022-06-21) 1 commit - - i18n: mark message helpers prefix for translation + (merged to 'next' on 2022-07-08 at 6f639750a1) + + i18n: mark message helpers prefix for translation - Give _() markings to fatal/warning/usage: that is shown in front of - these messages. + Give _() markings to fatal/warning/usage: labels that are shown in + front of these messages. - Will merge to 'next'. + Will merge to 'master'. source: * ds/t5510-brokequote (2022-06-21) 1 commit - - t5510: replace 'origin' with URL more carefully + (merged to 'next' on 2022-07-06 at 2776bed385) + + t5510: replace 'origin' with URL more carefully Test fix. + + Will merge to 'master'. source: <484a330e-0902-6e1b-8189-63c72dcea494@github.com> @@ -348,13 +471,14 @@ Release tarballs are available at: * rs/combine-diff-with-incompatible-options (2022-06-21) 2 commits - - combine-diff: abort if --output is given - - combine-diff: abort if --ignore-matching-lines is given + (merged to 'next' on 2022-07-02 at 0fe8b80a3e) + + combine-diff: abort if --output is given + + combine-diff: abort if --ignore-matching-lines is given 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 'master'. source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com> @@ -370,29 +494,30 @@ Release tarballs are available at: source: -* zh/ls-files-format (2022-06-27) 1 commit +* zh/ls-files-format (2022-07-06) 1 commit - ls-files: introduce "--format" option "git ls-files" learns the "--format" option to tweak its output. - Expecting a reroll. - cf. - source: + Getting closer to finish? + cf. <220705.86sfng9c5a.gmgdl@evledraar.gmail.com> + source: * ab/test-quoting-fix (2022-06-30) 3 commits - - config tests: fix harmless but broken "rm -r" cleanup - - test-lib.sh: fix prepend_var() quoting issue - - tests: add missing double quotes to included library paths + (merged to 'next' on 2022-07-06 at 0aa78fd9db) + + config tests: fix harmless but broken "rm -r" cleanup + + test-lib.sh: fix prepend_var() quoting issue + + tests: add missing double quotes to included library paths Fixes for tests when the source directory has unusual characters in its path, e.g. whitespaces, double-quotes, etc. - Will merge to 'next'. + Will merge to 'master'. source: -* en/merge-dual-dir-renames-fix (2022-06-30) 5 commits +* en/merge-dual-dir-renames-fix (2022-07-06) 5 commits - merge-ort: fix issue with dual rename and add/add conflict - merge-ort: shuffle the computation and cleanup of potential collisions - merge-ort: make a separate function for freeing struct collisions @@ -402,8 +527,8 @@ Release tarballs are available at: Fixes a long-standing corner case bug around directory renames in the merge-ort strategy. - Will merge to 'next'? - source: + Will merge to 'next'. + source: * cr/setup-bug-typo (2022-06-17) 1 commit @@ -417,25 +542,27 @@ Release tarballs are available at: * zk/push-use-bitmaps (2022-06-17) 1 commit - - send-pack.c: add config push.useBitmaps + (merged to 'next' on 2022-07-08 at 8aa1f94fad) + + send-pack.c: add config push.useBitmaps "git push" sometimes perform poorly when reachability bitmaps are used, even in a repository where other operations are helped by 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 'master'. source: * jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit - - remote: handle negative refspecs in git remote show + (merged to 'next' on 2022-07-08 at d4e49ad22a) + + remote: handle negative refspecs in git remote show (this branch is used by jk/t5505-restructure.) "git remote show [-n] frotz" now pays attention to negative pathspecs. - Will merge to 'next'. + Will merge to 'master'. source: <20220617002036.1577-2-jacob.keller@gmail.com> @@ -458,27 +585,26 @@ Release tarballs are available at: * ro/mktree-allow-missing-fix (2022-06-21) 1 commit - - mktree: do not check type of remote objects + (merged to 'next' on 2022-07-08 at 599ed6fb84) + + mktree: do not check type of remote objects "git mktree --missing" lazily fetched objects that are missing from - the local object store, which was totally unnecessary. + the local object store, which was totally unnecessary for the purpose + of creating the tree object(s) from its input. - Will merge to 'next'. + Will merge to 'master'. source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com> -* ll/curl-accept-language (2022-06-13) 2 commits - - PREP??? give initializer to rpc_state - - remote-curl: send Accept-Language header to server - - source: - - * pb/diff-doc-raw-format (2022-06-13) 3 commits - - diff-index.txt: update raw output format in examples - - diff-format.txt: correct misleading wording - - diff-format.txt: dst can be 0* SHA-1 when path is deleted, too + (merged to 'next' on 2022-07-02 at 198480cbc6) + + diff-index.txt: update raw output format in examples + + diff-format.txt: correct misleading wording + + diff-format.txt: dst can be 0* SHA-1 when path is deleted, too + Update "git diff/log --raw" format documentation. + + Will merge to 'master'. source: @@ -534,23 +660,24 @@ Release tarballs are available at: * ab/submodule-cleanup (2022-06-28) 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 - - submodule--helper: understand --checkout, --merge and --rebase synonyms - - submodule--helper: report "submodule" as our name in some "-h" output - - submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs" - - submodule update: remove "-v" option - - submodule--helper: have --require-init imply --init - - git-submodule.sh: remove unused top-level "--branch" argument - - git-submodule.sh: make the "$cached" variable a boolean - - git-submodule.sh: remove unused $prefix variable - - git-submodule.sh: remove unused sanitize_submodule_env() + (merged to 'next' on 2022-07-08 at 6f3886aa03) + + git-sh-setup.sh: remove "say" function, change last users + + git-submodule.sh: use "$quiet", not "$GIT_QUIET" + + submodule--helper: eliminate internal "--update" option + + submodule--helper: understand --checkout, --merge and --rebase synonyms + + submodule--helper: report "submodule" as our name in some "-h" output + + submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs" + + submodule update: remove "-v" option + + submodule--helper: have --require-init imply --init + + git-submodule.sh: remove unused top-level "--branch" argument + + git-submodule.sh: make the "$cached" variable a boolean + + git-submodule.sh: remove unused $prefix variable + + git-submodule.sh: remove unused sanitize_submodule_env() (this branch is used by gc/submodule-use-super-prefix.) Further preparation to turn git-submodule.sh into a builtin. - Will merge to 'next'. + Will merge to 'master'. source: @@ -576,6 +703,8 @@ Release tarballs are available at: - gitweb/Makefile: define all .PHONY prerequisites inline Teach "make all" to build gitweb as well. + + Will merge to 'next'? source: @@ -609,18 +738,19 @@ Release tarballs are available at: * hx/unpack-streaming (2022-06-13) 6 commits - - unpack-objects: use stream_loose_object() to unpack large objects - - core doc: modernize core.bigFileThreshold documentation - - object-file.c: add "stream_loose_object()" to handle large object - - object-file.c: factor out deflate part of write_loose_object() - - object-file.c: refactor write_loose_object() to several steps - - unpack-objects: low memory footprint for get_data() in dry_run mode + (merged to 'next' on 2022-07-08 at 4eb375ec2f) + + unpack-objects: use stream_loose_object() to unpack large objects + + core doc: modernize core.bigFileThreshold documentation + + object-file.c: add "stream_loose_object()" to handle large object + + object-file.c: factor out deflate part of write_loose_object() + + object-file.c: refactor write_loose_object() to several steps + + unpack-objects: low memory footprint for get_data() in dry_run mode Allow large objects read from a packstream to be streamed into a loose object file straight, without having to keep it in-core as a whole. - Will merge to 'next'. + Will merge to 'master'. source: @@ -669,10 +799,13 @@ Release tarballs are available at: - bisect: verify that a bogus option won't try to start a bisection Final bits of "git bisect.sh" have been rewritten in C. + + Expecting a (hopefully final) reroll. + cf. <20627.86ilolhnnn.gmgdl@evledraar.gmail.com> source: -* gc/bare-repo-discovery (2022-06-30) 5 commits +* gc/bare-repo-discovery (2022-07-07) 5 commits - setup.c: create `discovery.bare` - safe.directory: use git_protected_config() - config: learn `git_protected_config()` @@ -681,35 +814,33 @@ Release tarballs are available at: Introduce a discovery.barerepository configuration variable that allows users to forbid discovery of bare repositories. - - Will merge to 'next'? - source: + source: * gg/worktree-from-the-above (2022-06-21) 2 commits - - dir: minor refactoring / clean-up - - dir: traverse into repository + (merged to 'next' on 2022-07-08 at fa0e71ba39) + + dir: minor refactoring / clean-up + + dir: traverse into repository - With a non-bare repository, with core.worktree pointing at a - directory that has the repository as its subdirectory, regressed in - Git 2.27 days. + In a non-bare repository, the behavior of Git when the + core.worktree configuration variable points at a directory that has + a repository as its subdirectory, regressed in Git 2.27 days. - Will merge to 'next'. + Will merge to 'master'. source: <20220616234433.225-1-gg.oss@outlook.com> source: <20220616231956.154-1-gg.oss@outlook.com> +-------------------------------------------------- +[Discarded] * ar/send-email-confirm-by-default (2022-04-22) 1 commit - - send-email: always confirm by default + . send-email: always confirm by default "git send-email" is changed so that by default it asks for confirmation before sending each message out. - Will discard. - + Discarded. I wanted to like this, and had it in the version of Git I use myself for daily work, but the prompting turned out to be somewhat distracting. - - Thoughts? source: <20220422083629.1404989-1-hi@alyssa.is>