From: Junio C Hamano Date: Mon, 5 Aug 2024 21:01:36 +0000 (-0700) Subject: What's cooking (2024/08 #02) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a592b151fc45e8b62e2b6c334b601975d4deb843;p=thirdparty%2Fgit.git What's cooking (2024/08 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index bbafb70c65..97d4cf83f1 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Aug 2024, #01; Thu, 1) +Subject: What's cooking in git.git (Aug 2024, #02; Mon, 5) X-master-at: 406f326d271e0bacecdb00425422c5fa3f314930 -X-next-at: e559c4bf1a306cf5814418d318cc0fea070da3c7 +X-next-at: 2dc1a81c89335c22ab35fc7caa8d1eb006790da8 Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Aug 2024, #01; Thu, 1) +What's cooking in git.git (Aug 2024, #02; Mon, 5) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,9 +17,6 @@ topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). -The first two batches of topics have graduated to 'master' and -'next' has been rewound on top of 'master'. - 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,154 +46,139 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[Graduated to 'master'] +[New Topics] -* ad/merge-with-diff-algorithm (2024-07-13) 1 commit - (merged to 'next' on 2024-07-16 at 90fe5aff4d) - + merge-recursive: honor diff.algorithm +* ag/t7004-modernize (2024-08-04) 6 commits + - t7004-tag: description on the same line as test_expect_success + - t7004-tag: here-doc modernization + - t7004-tag: do not prepare except outside test_expect_success + - t7004-tag: one command per line + - t7004-tag: do not lose exit status to pipe + - t7004-tag: redirection operator - Many Porcelain commands that internally use the merge machinery - were taught to consistently honor the diff.algorithm configuration. - source: + Coding style fixes to a test script. + Inviting further discussion. + source: <20240804071137.30326-1-abdobngad@gmail.com> -* as/show-ref-option-help-update (2024-07-25) 1 commit - (merged to 'next' on 2024-07-26 at bbdc971c38) - + show-ref: improve short help messages of options - A few descriptions in "git show-ref -h" have been clarified. - source: <20240724111116.91615-1-ash@kambanaria.org> +* ds/for-each-ref-is-base (2024-08-02) 3 commits + - p1500: add is-base performance tests + - for-each-ref: add 'is-base' token + - commit-reach: add get_branch_base_for_tip + 'git for-each-ref' learned a new "--format" atom to find the branch + that the history leading to a given commit "%(is-base:)" is + likely based on. -* cp/unit-test-reftable-merged (2024-07-12) 7 commits - (merged to 'next' on 2024-07-23 at 88d2a9ee28) - + t-reftable-merged: add test for REFTABLE_FORMAT_ERROR - + t-reftable-merged: use reftable_ref_record_equal to compare ref records - + t-reftable-merged: add tests for reftable_merged_table_max_update_index - + t-reftable-merged: improve the const-correctness of helper functions - + t-reftable-merged: improve the test t_merged_single_record() - + t: harmonize t-reftable-merged.c with coding guidelines - + t: move reftable/merged_test.c to the unit testing framework + Expecting a reroll. + source: - Another reftable test has been ported to use the unit test framework. - source: <20240712055041.6476-1-chandrapratap3519@gmail.com> +* jk/apply-patch-mode-check-fix (2024-08-05) 1 commit + (merged to 'next' on 2024-08-05 at 2dc1a81c89) + + apply: canonicalize modes read from patches -* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit - (merged to 'next' on 2024-07-22 at 9573259db9) - + checkout: special case error messages during noop switching + The patch parser in 'git apply' has been a bit more lenient against + unexpected mode bits, like 100664, recorded on extended header lines. - "git checkout --ours" (no other arguments) complained that the - option is incompatible with branch switching, which is technically - correct, but found confusing by some users. It now says that the - user needs to give pathspec to specify what paths to checkout. - source: + Will merge to 'master'. + source: <20240805060010.GA120016@coredump.intra.peff.net> -* jc/doc-one-shot-export-with-shell-func (2024-07-23) 1 commit - (merged to 'next' on 2024-07-23 at 621c29e4f6) - + CodingGuidelines: document a shell that "fails" "VAR=VAL shell_func" +* kl/test-fixes (2024-08-05) 2 commits + - t6421: fix test to work when repo dir contains d0 + - set errno=0 before strtoX calls - It has been documented that we avoid "VAR=VAL shell_func" and why. - source: + A flakey test and incorrect calls to strtoX() functions have been + fixed. + Will merge to 'next'. + source: -* jc/doc-rebase-fuzz-vs-offset-fix (2024-07-25) 1 commit - (merged to 'next' on 2024-07-26 at 6f784b0c1c) - + doc: difference in location to apply is "offset", not "fuzz" - "git rebase --help" referred to "offset" (the difference between - the location a change was taken from and the change gets replaced) - incorrectly and called it "fuzz", which has been corrected. - source: +* ps/ls-remote-out-of-repo-fix (2024-08-02) 1 commit + (merged to 'next' on 2024-08-05 at 6438d8196d) + + builtin/ls-remote: fall back to SHA1 outside of a repo + A recent update broke "git ls-remote" used outside a repository, + which has been corrected. -* jc/doc-reviewing-guidelines-positive-reviews (2024-07-25) 1 commit - (merged to 'next' on 2024-07-26 at 8f878efb0d) - + ReviewingGuidelines: encourage positive reviews more + Will merge to 'master'. + source: - The reviewing guidelines document now explicitly encourages people - to give positive reviews and how. - source: +* ps/ref-api-cleanup (2024-08-02) 1 commit + (merged to 'next' on 2024-08-05 at d57856ae19) + + refs: drop `ref_store`-less functions -* jc/how-to-maintain-updates (2024-07-19) 2 commits - (merged to 'next' on 2024-07-26 at c950efa46d) - + howto-maintain: update daily tasks - + howto-maintain: cover a whole development cycle + Code clean-up. - Doc update. - source: + Will merge to 'master'. + source: <1d9add71065dabb3d7bf81529d04afbcf91e3a69.1722577074.git.ps@pks.im> -* jt/doc-post-receive-hook-update (2024-07-15) 1 commit - (merged to 'next' on 2024-07-17 at 624ac4ebe2) - + doc: clarify post-receive hook behavior +* rs/use-decimal-width (2024-08-05) 1 commit + - log-tree: use decimal_width() - Doc update. - source: <20240715183739.7808-1-jltobler@gmail.com> + Code clean-up. + Will merge to 'next'. + source: <06783722-5184-41d5-8edd-94f97b2f2794@web.de> -* kn/ci-clang-format (2024-07-23) 6 commits - (merged to 'next' on 2024-07-23 at 3aca45d08a) - + ci/style-check: add `RemoveBracesLLVM` in CI job - + check-whitespace: detect if no base_commit is provided - + ci: run style check on GitHub and GitLab - + clang-format: formalize some of the spacing rules - + clang-format: avoid spacing around bitfield colon - + clang-format: indent preprocessor directives after hash - (this branch is used by ps/doc-more-c-coding-guidelines.) - A CI job that use clang-format to check coding style issues in new - code has been added. - source: <20240723082111.874382-1-karthik.188@gmail.com> +* ss/packed-ref-store-leakfix (2024-08-05) 1 commit + - refs/files: prevent memory leak by freeing packed_ref_store + Leakfix. -* pw/add-patch-with-suppress-blank-empty (2024-07-20) 2 commits - (merged to 'next' on 2024-07-22 at 5437b7dee3) - + add-patch: use normalize_marker() when recounting edited hunk - + add-patch: handle splitting hunks with diff.suppressBlankEmpty + Will merge to 'next'. + source: - "git add -p" by users with diff.suppressBlankEmpty set to true - failed to parse the patch that represents an unmodified empty line - with an empty line (not a line with a single space on it), which - has been corrected. - source: +* tb/t7704-deflake (2024-08-05) 1 commit + - t/t7704-repack-cruft.sh: avoid failures during long-running tests -* rj/make-cleanup (2024-07-18) 2 commits - (merged to 'next' on 2024-07-22 at bf3991f70f) - + config.mak.uname: remove unused uname_P variable - + Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGS + A test that fails on an unusually slow machine was found, and made + less likely to cause trouble by lengthening the expiry value it + uses. - A build tweak knob has been simplified by not setting the value - that is already the default; another unused one has been removed. - source: <0d132370-3e07-4332-bcfb-c4450100d736@ramsayjones.plus.com> + Will merge to 'next'. + source: <95cdc30bad38f464b37e87d78f38e1d91c9e083b.1722886630.git.me@ttaylorr.com> +-------------------------------------------------- +[Stalled] -* rs/t-strvec-use-test-msg (2024-07-16) 3 commits - (merged to 'next' on 2024-07-16 at 3e860b3f12) - + t-strvec: fix type mismatch in check_strvec - (merged to 'next' on 2024-07-15 at f26e434515) - + t-strvec: improve check_strvec() output - (merged to 'next' on 2024-07-08 at c28c2553de) - + t-strvec: use test_msg() +* pp/add-parse-range-unit-test (2024-05-27) 1 commit + - apply: add unit tests for parse_range - Unit test clean-up. - source: <35b0ba6b-d485-44f2-a19f-3ce816f8b435@web.de> - source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de> - source: <1521ed89-989e-452b-b7fc-9e73672e0764@web.de> + A unit test for code that parses the hunk offset and length from a + patch fragment header as been added. + Expecting a reroll. + cf. + source: -* tn/doc-commit-fix (2024-07-22) 1 commit - (merged to 'next' on 2024-07-23 at eb73e04ee4) - + doc: remove dangling closing parenthesis +-------------------------------------------------- +[Cooking] - Docfix. - source: <20240722225302.124356-1-tomasn@posteo.net> +* sj/ref-fsck (2024-08-05) 9 commits + - fsck: add ref name check for files backend + - files-backend: add unified interface for refs scanning + - builtin/refs: add verify subcommand + - refs: set up ref consistency check infrastructure + - fsck: add refs report function + - fsck: add a unified interface for reporting fsck messages + - fsck: make "fsck_error" callback generic + - fsck: rename objects-related fsck error functions + - fsck: rename "skiplist" to "skip_oids" + + "git fsck" infrastructure has been taught to also check the sanity + of the ref database, in addition to the object database. + + Ready? + source: --------------------------------------------------- -[New Topics] * dd/notes-empty-no-edit-by-default (2024-07-29) 1 commit (merged to 'next' on 2024-08-01 at fe75c53260) @@ -284,7 +266,7 @@ Release tarballs are available at: source: <20240731134014.2299361-1-christian.couder@gmail.com> -* ps/reftable-stack-compaction (2024-07-31) 8 commits +* ps/reftable-stack-compaction (2024-08-05) 9 commits - reftable/stack: handle locked tables during auto-compaction - reftable/stack: fix corruption on concurrent compaction - reftable/stack: use lock_file when adding table to "tables.list" @@ -292,26 +274,28 @@ Release tarballs are available at: - reftable/stack: simplify tracking of table locks - reftable/stack: update stats on failed full compaction - reftable/stack: test compaction with already-locked tables + - reftable/stack: extract function to setup stack with N tables - reftable/stack: refactor function to gather table sizes The code paths to compact multiple reftable files have been updated to correctly deal with multiple compaction triggering at the same time. - Needs review. - source: + Inviting further discussion. + source: -* rh/http-proxy-path (2024-08-01) 1 commit - - http: do not ignore proxy path +* rh/http-proxy-path (2024-08-02) 1 commit + (merged to 'next' on 2024-08-05 at d6f1fb194a) + + http: do not ignore proxy path The value of http.proxy can have "path" at the end for a socks proxy that listens to a unix-domain socket, but we started to discard it when we taught proxy auth code path to use the credential helpers, which has been corrected. - Will merge to 'next'. - source: + Will merge to 'master'. + source: * jc/refs-symref-referent (2024-08-01) 4 commits @@ -329,12 +313,13 @@ Release tarballs are available at: * jk/osxkeychain-username-is-nul-terminated (2024-08-01) 1 commit - - credential/osxkeychain: respect NUL terminator in username + (merged to 'next' on 2024-08-05 at 34a238e047) + + credential/osxkeychain: respect NUL terminator in username The credential helper to talk to OSX keychain sometimes sent garbage bytes after the username, which has been corrected. - Will merge to 'next'. + Will merge to 'master'. source: <20240801082556.GA640360@coredump.intra.peff.net> @@ -357,67 +342,21 @@ Release tarballs are available at: Will merge to 'next'. source: --------------------------------------------------- -[Stalled] - -* sj/ref-fsck (2024-07-30) 10 commits - . fsck: add ref content check for files backend - . fsck: add ref name check for files backend - . files-backend: add unified interface for refs scanning - . builtin/fsck: add `git-refs verify` child process - . git refs: add verify subcommand - . refs: set up ref consistency check infrastructure - . fsck: add refs-related error report function - . fsck: rename objects-related fsck error functions - . fsck: add a unified interface for reporting fsck messages - . fsck: rename "skiplist" to "skip_oids" - - "git fsck" infrastructure has been taught to also check the sanity - of the ref database, in addition to the object database. - - Needs update. - Contradicts with Patrick's the_repository elimination series. - source: - - -* pp/add-parse-range-unit-test (2024-05-27) 1 commit - - apply: add unit tests for parse_range - - A unit test for code that parses the hunk offset and length from a - patch fragment header as been added. - - Expecting a reroll. - cf. - source: - - -* cw/git-std-lib (2024-02-28) 4 commits - . SQUASH??? get rid of apparent debugging crufts - . test-stdlib: show that git-std-lib is independent - . git-std-lib: introduce Git Standard Library - . pager: include stdint.h because uintmax_t is used - - Split libgit.a out to a separate git-std-lib tor easier reuse. - - Expecting a reroll. - source: - --------------------------------------------------- -[Cooking] * cp/unit-test-reftable-pq (2024-08-01) 7 commits - - t-reftable-pq: add tests for merged_iter_pqueue_top() - - t-reftable-pq: add test for index based comparison - - t-reftable-pq: make merged_iter_pqueue_check() callable by reference - - t-reftable-pq: make merged_iter_pqueue_check() static - - t: move reftable/pq_test.c to the unit testing framework - - reftable: change the type of array indices to 'size_t' in reftable/pq.c - - reftable: remove unnecessary curly braces in reftable/pq.c + (merged to 'next' on 2024-08-05 at 05e47f7097) + + t-reftable-pq: add tests for merged_iter_pqueue_top() + + t-reftable-pq: add test for index based comparison + + t-reftable-pq: make merged_iter_pqueue_check() callable by reference + + t-reftable-pq: make merged_iter_pqueue_check() static + + t: move reftable/pq_test.c to the unit testing framework + + reftable: change the type of array indices to 'size_t' in reftable/pq.c + + reftable: remove unnecessary curly braces in reftable/pq.c The tests for "pq" part of reftable library got rewritten to use the unit test framework. - Will merge to 'next'. + Will merge to 'master'. cf. source: <20240801110453.5087-1-chandrapratap3519@gmail.com> @@ -485,57 +424,67 @@ Release tarballs are available at: Allow "git fetch" take advantage of bundleURI feature. - Needs review. - source: <20240724144957.3033840-1-toon@iotcl.com> + Expecting a reroll or retraction. + source: * jc/leakfix-hashfile (2024-07-26) 1 commit - csum-file: introduce discard_hashfile() + Leakfix. + + Will merge to 'next'. source: * jc/leakfix-mailmap (2024-07-26) 1 commit - mailmap: plug memory leak in read_mailmap_blob() + Leakfix. + + Will merge to 'next'. source: * jr/ls-files-expand-literal-doc (2024-07-26) 1 commit - doc: fix hex code escapes in git-ls-files + Docfix. + + Will merge to 'next'. source: * ps/leakfixes-part-3 (2024-08-01) 24 commits - - commit-reach: fix trivial memory leak when computing reachability - - convert: fix leaking config strings - - entry: fix leaking pathnames during delayed checkout - - object-name: fix leaking commit list items - - t/test-repository: fix leaking repository - - builtin/credential-cache: fix trivial leaks - - builtin/worktree: fix leaking derived branch names - - builtin/shortlog: fix various trivial memory leaks - - builtin/rerere: fix various trivial memory leaks - - builtin/credential-store: fix leaking credential - - builtin/show-branch: fix several memory leaks - - builtin/rev-parse: fix memory leak with `--parseopt` - - builtin/stash: fix various trivial memory leaks - - builtin/remote: fix various trivial memory leaks - - builtin/remote: fix leaking strings in `branch_list` - - builtin/ls-remote: fix leaking `pattern` strings - - builtin/submodule--helper: fix leaking buffer in `is_tip_reachable` - - builtin/submodule--helper: fix leaking clone depth parameter - - builtin/name-rev: fix various trivial memory leaks - - builtin/describe: fix trivial memory leak when describing blob - - builtin/describe: fix leaking array when running diff-index - - builtin/describe: fix memory leak with `--contains=` - - builtin/log: fix leaking branch name when creating cover letters - - builtin/replay: plug leaking `advance_name` variable + (merged to 'next' on 2024-08-05 at e3d94036ff) + + commit-reach: fix trivial memory leak when computing reachability + + convert: fix leaking config strings + + entry: fix leaking pathnames during delayed checkout + + object-name: fix leaking commit list items + + t/test-repository: fix leaking repository + + builtin/credential-cache: fix trivial leaks + + builtin/worktree: fix leaking derived branch names + + builtin/shortlog: fix various trivial memory leaks + + builtin/rerere: fix various trivial memory leaks + + builtin/credential-store: fix leaking credential + + builtin/show-branch: fix several memory leaks + + builtin/rev-parse: fix memory leak with `--parseopt` + + builtin/stash: fix various trivial memory leaks + + builtin/remote: fix various trivial memory leaks + + builtin/remote: fix leaking strings in `branch_list` + + builtin/ls-remote: fix leaking `pattern` strings + + builtin/submodule--helper: fix leaking buffer in `is_tip_reachable` + + builtin/submodule--helper: fix leaking clone depth parameter + + builtin/name-rev: fix various trivial memory leaks + + builtin/describe: fix trivial memory leak when describing blob + + builtin/describe: fix leaking array when running diff-index + + builtin/describe: fix memory leak with `--contains=` + + builtin/log: fix leaking branch name when creating cover letters + + builtin/replay: plug leaking `advance_name` variable More leakfixes. - Will merge to 'next'. + Will merge to 'master'. cf. source: @@ -581,18 +530,19 @@ Release tarballs are available at: * jc/safe-directory (2024-07-30) 4 commits - - safe.directory: setting safe.directory="." allows the "current" directory - - safe.directory: normalize the configured path - - safe.directory: normalize the checked path - - safe.directory: preliminary clean-up + (merged to 'next' on 2024-08-05 at 77aa0f1d08) + + safe.directory: setting safe.directory="." allows the "current" directory + + safe.directory: normalize the configured path + + safe.directory: normalize the checked path + + safe.directory: preliminary clean-up Follow-up on 2.45.1 regression fix. - Will merge to 'next'. + Will merge to 'master'. source: <20240730184352.2503276-1-gitster@pobox.com> -* cp/unit-test-reftable-tree (2024-07-22) 5 commits +* cp/unit-test-reftable-tree (2024-08-04) 5 commits - t-reftable-tree: improve the test for infix_walk() - t-reftable-tree: add test for non-existent key - t-reftable-tree: split test_tree() into two sub-test functions @@ -602,8 +552,10 @@ Release tarballs are available at: A test in reftable library has been rewritten using the unit test framework. - Needs review. - source: <20240722061836.4176-1-chandrapratap3519@gmail.com> + Will merge to 'next'. + cf. + cf. + source: <20240804141105.4268-1-chandrapratap3519@gmail.com> * ew/cat-file-optim (2024-07-15) 10 commits @@ -620,7 +572,8 @@ Release tarballs are available at: "git cat-file --batch" has been optimized. - Needs review. + Expecting a reroll. + cf. source: <20240715003519.2671385-1-e@80x24.org> @@ -629,7 +582,7 @@ Release tarballs are available at: Doc update. - Needs review. + Will merge to 'next'. source: @@ -639,18 +592,18 @@ Release tarballs are available at: "git reflog expire" failed to honor annotated tags when computing reachable commits. - Needs review. + Will merge to 'next'. source: -* es/doc-platform-support-policy (2024-07-30) 1 commit +* es/doc-platform-support-policy (2024-08-02) 1 commit - Documentation: add platform support policy A policy document that describes platform support levels and expectation on platform stakeholders has been introduced. - Inviding further discussion. - source: <20240730175448.1727373-1-emilyshaffer@google.com> + Will merge to 'next'? + source: <20240802221948.2367124-1-emilyshaffer@google.com> * rj/add-p-pager (2024-07-25) 4 commits @@ -687,7 +640,7 @@ Release tarballs are available at: Unit-test framework clean-up. - Still under discussion. + Still under discussion? source: <077a178e-eb30-45ff-b653-a514bfd33077@web.de> @@ -702,5 +655,6 @@ Release tarballs are available at: getting confused by lines that look like a patch header in the log message. - Inviding further discussion. + Will merge to 'next'. + cf. source: <20240730011738.4032377-1-gitster@pobox.com>