From: Junio C Hamano Date: Thu, 18 Jul 2024 16:51:52 +0000 (-0700) Subject: What's cooking (2024/07 #06) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d39a965d61dba42ad82831e017dd34622f0e5e5;p=thirdparty%2Fgit.git What's cooking (2024/07 #06) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 4bd0221984..f69f004ef4 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 (Jul 2024, #05; Tue, 16) -X-master-at: 04f5a52757cd92347271e24f7cbdfe15dafce3b7 -X-next-at: 44c27ab58a06e5c08647e891ceb89879d1423b71 +Subject: What's cooking in git.git (Jul 2024, #06; Thu, 18) +X-master-at: d19b6cd2dd72dc811f19df4b32c7ed223256c3ee +X-next-at: 9752f9e123323e801511d405efab0fe0db92f038 Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Jul 2024, #05; Tue, 16) +What's cooking in git.git (Jul 2024, #06; Thu, 18) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,6 +17,12 @@ topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). +Git 2.46-rc1 has been tagged. From now on until the final release, +which is planned to happen near the end of this month, please make +sure you place priorities on finding and fixing new regressions +introduced during this cycle over finding and fixing old bugs, over +any shiny new features. + 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. @@ -48,242 +54,139 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* am/gitweb-feed-use-committer-date (2024-07-07) 1 commit - (merged to 'next' on 2024-07-08 at 65215ab842) - + gitweb: rss/atom change published/updated date to committer date - - GitWeb update to use committer date consistently in rss/atom feeds. - source: <20240707184813.33166-1-080ariel@gmail.com> - - -* as/describe-broken-refresh-index-fix (2024-06-26) 1 commit - (merged to 'next' on 2024-07-08 at 2307a4a4ae) - + describe: refresh the index when 'broken' flag is used - - "git describe --dirty --broken" forgot to refresh the index before - seeing if there is any chang, ("git describe --dirty" correctly did - so), which has been corrected. - source: <20240626190801.68472-1-abhijeet.nkt@gmail.com> - - -* bc/gitfaq-more (2024-07-09) 4 commits - (merged to 'next' on 2024-07-10 at eeec4009e4) - + doc: mention that proxies must be completely transparent - + gitfaq: add entry about syncing working trees - + gitfaq: give advice on using eol attribute in gitattributes - + gitfaq: add documentation on proxies - - A handful of entries are added to the GitFAQ document. - source: <20240709233746.445860-1-sandals@crustytoothpaste.net> - - -* bc/http-proactive-auth (2024-07-09) 1 commit - (merged to 'next' on 2024-07-10 at 29b050bf0e) - + http: allow authenticating proactively - - The http transport can now be told to send request with - authentication material without first getting a 401 response. - source: <20240710000155.947377-2-sandals@crustytoothpaste.net> - - -* cb/send-email-sanitize-trailer-addresses (2024-07-01) 1 commit - (merged to 'next' on 2024-07-09 at 442a99106a) - + git-send-email: use sanitized address when reading mbox body +* ch/refs-without-the-repository-fix (2024-07-16) 1 commit + (merged to 'next' on 2024-07-17 at 89f907db0d) + + refs: correct the version numbers in a comment - Address-looking strings found on the trailer are now placed on the - Cc: list after running through sanitize_address by "git send-email". - source: <20240701090115.56957-1-csokas.bence@prolan.hu> + Comment fix. + source: <20240716095544.65931-1-list@eworm.de> -* cp/unit-test-reftable-record (2024-07-02) 11 commits - (merged to 'next' on 2024-07-08 at b534dac338) - + t-reftable-record: add tests for reftable_log_record_compare_key() - + t-reftable-record: add tests for reftable_ref_record_compare_name() - + t-reftable-record: add index tests for reftable_record_is_deletion() - + t-reftable-record: add obj tests for reftable_record_is_deletion() - + t-reftable-record: add log tests for reftable_record_is_deletion() - + t-reftable-record: add ref tests for reftable_record_is_deletion() - + t-reftable-record: add comparison tests for obj records - + t-reftable-record: add comparison tests for index records - + t-reftable-record: add comparison tests for ref records - + t-reftable-record: add reftable_record_cmp() tests for log records - + t: move reftable/record_test.c to the unit testing framework +* jc/http-cookiefile (2024-07-09) 1 commit + (merged to 'next' on 2024-07-11 at abdd5711d2) + + http.c: cookie file tightening - A test in reftable library has been rewritten using the unit test - framework. - cf. - source: <20240702074906.5587-1-chandrapratap3519@gmail.com> + The http.cookieFile and http.saveCookies configuration variables + have a few values that need to be avoided, which are now ignored + with warning messages. + source: -* ds/advice-sparse-index-expansion (2024-07-08) 1 commit - (merged to 'next' on 2024-07-09 at c821020b13) - + advice: warn when sparse index expands +* jk/am-retry (2024-07-17) 1 commit + (merged to 'next' on 2024-07-17 at 012d05db3b) + + t4153: stop redirecting input from /dev/zero - A new warning message is issued when a command has to expand a - sparse index to handle working tree cruft that are outside of the - sparse checkout. - source: + Test fix as a follow-up to an already graduated topic. + source: <20240717070050.GG547635@coredump.intra.peff.net> -* en/ort-inner-merge-error-fix (2024-07-06) 8 commits - (merged to 'next' on 2024-07-09 at 74bdae0b3b) - + merge-ort: fix missing early return - (merged to 'next' on 2024-06-28 at a85fe270e6) - + merge-ort: convert more error() cases to path_msg() - + merge-ort: upon merge abort, only show messages causing the abort - + merge-ort: loosen commented requirements - + merge-ort: clearer propagation of failure-to-function from merge_submodule - + merge-ort: fix type of local 'clean' var in handle_content_merge () - + merge-ort: maintain expected invariant for priv member - + merge-ort: extract handling of priv member into reusable function +* jk/test-body-in-here-doc (2024-07-10) 10 commits + (merged to 'next' on 2024-07-11 at 854733cffc) + + t/.gitattributes: ignore whitespace in chainlint expect files + + t: convert some here-doc test bodies + + test-lib: allow test snippets as here-docs + + chainlint.pl: add tests for test body in heredoc + + chainlint.pl: recognize test bodies defined via heredoc + + chainlint.pl: check line numbers in expected output + + chainlint.pl: force CRLF conversion when opening input files + + chainlint.pl: do not spawn more threads than we have scripts + + chainlint.pl: only start threads if jobs > 1 + + chainlint.pl: add test_expect_success call to test snippets - The "ort" merge backend saw one bugfix for a crash that happens - when inner merge gets killed, and assorted code clean-ups. - source: + The test framework learns to take the test body not as a single + string but as a here-document. + source: <20240710083416.GA2060328@coredump.intra.peff.net> -* gt/unit-test-oidmap (2024-07-03) 1 commit - (merged to 'next' on 2024-07-08 at 4e7394fc67) - + t: migrate helper/test-oidmap.c to unit-tests/t-oidmap.c +* js/unit-test-oidtree-cmake-fix (2024-07-12) 1 commit + (merged to 'next' on 2024-07-15 at d7aac9004c) + + cmake: fix build of `t-oidtree` - An existing test of oidmap API has been rewritten with the - unit-test framework. - source: <20240703062958.23262-2-shyamthakkar001@gmail.com> + Build fix. + source: -* jc/disable-push-nego-for-deletion (2024-07-02) 1 commit - (merged to 'next' on 2024-07-08 at 18411fb8ac) - + push: avoid showing false negotiation errors +* js/var-git-shell-path (2024-07-13) 7 commits + (merged to 'next' on 2024-07-15 at 2e5b0eea39) + + var(win32): do report the GIT_SHELL_PATH that is actually used + + run-command: declare the `git_shell_path()` function globally + + run-command(win32): resolve the path to the Unix shell early + + mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too + + win32: override `fspathcmp()` with a directory separator-aware version + + strvec: declare the `strvec_push_nodup()` function globally + + run-command: refactor getting the Unix shell path into its own function - "git push" that pushes only deletion gave an unnecessary and - harmless error message when push negotiation is configured, which + "git var GIT_SHELL_PATH" should report the path to the shell used + to spawn external commands, but it didn't do so on Windows, which has been corrected. - source: - - -* jc/where-is-bash-for-ci (2024-07-08) 1 commit - (merged to 'next' on 2024-07-09 at 14b00e672e) - + ci: unify bash calling convention - - Shell script clean-up. - source: - - -* jk/tests-without-dns (2024-06-26) 3 commits - (merged to 'next' on 2024-07-08 at 21af592457) - + t/lib-bundle-uri: use local fake bundle URLs - + t5551: do not confirm that bogus url cannot be used - + t5553: use local url for invalid fetch - - Test suite has been taught not to unnecessarily rely on DNS failing - a bogus external name. - source: <20240626205355.GA1009060@coredump.intra.peff.net> - - -* mh/userdiff-typescript (2024-07-15) 1 commit - - userdiff: add builtin diff driver for TypeScript language - - With known shortcomings. - cf. <20240716122112.zqauqgxmng2tk2j6@archP14s> - source: - - -* ri/doc-show-branch-fix (2024-07-08) 1 commit - (merged to 'next' on 2024-07-08 at efcb154dfe) - + doc: fix the max number of branches shown by "show-branch" - - Docfix. - source: - - -* rj/t0612-no-longer-leaks (2024-07-01) 1 commit - (merged to 'next' on 2024-07-08 at a63b027a20) - + t0612: mark as leak-free - - A test that no longer leaks has been marked as such. - source: <86427b9e-9574-4e61-890a-691779a8da82@gmail.com> - + source: -* rj/t0613-no-longer-leaks (2024-07-01) 1 commit - (merged to 'next' on 2024-07-08 at b6149c3032) - + t0613: mark as leak-free - A test that no longer leaks has been marked as such. - source: <23d41343-54fd-46c6-9d78-369e8009fa0b@gmail.com> +* kn/push-empty-fix (2024-07-12) 1 commit + (merged to 'next' on 2024-07-13 at 74598adb55) + + builtin/push: call set_refspecs after validating remote + "git push '' HEAD:there" used to hit a BUG(); it has been corrected + to die with "fatal: bad repository ''". + source: <20240711093954.20317-1-karthik.188@gmail.com> -* rs/clang-format-updates (2024-07-06) 1 commit - (merged to 'next' on 2024-07-08 at d2b5b41844) - + clang-format: include kh_foreach* macros in ForEachMacros - Custom control structures we invented more recently have been - taught to the clang-format file. - source: <4e7893f5-2dd9-46cf-8a64-cf780f4e1730@web.de> +* ps/doc-http-empty-cookiefile (2024-07-11) 1 commit + (merged to 'next' on 2024-07-13 at 801dcb5a35) + + doc: update http.cookieFile with in-memory cookie processing + What happens when http.cookieFile gets the special value "" has + been clarified in the documentation.. + source: -* tb/dev-build-pedantic-fix (2024-07-06) 1 commit - (merged to 'next' on 2024-07-08 at 7f34cc6c5b) - + config.mak.dev: fix typo when enabling -Wpedantic - Developer build procedure fix. - source: +* ps/pseudo-ref-terminology (2024-07-17) 1 commit + (merged to 'next' on 2024-07-17 at 8886abf078) + + Documentation/glossary: fix double word --------------------------------------------------- -[New Topics] + Doc update. + source: <20240717105432.2801097-2-martin.agren@gmail.com> -* ew/cat-file-optim (2024-07-15) 10 commits - - cat-file: use writev(2) if available - - cat-file: batch_write: use size_t for length - - cat-file: batch-command uses content_limit - - object_info: content_limit only applies to blobs - - packfile: packed_object_info avoids packed_to_object_type - - cat-file: use delta_base_cache entries directly - - packfile: inline cache_or_unpack_entry - - packfile: fix off-by-one in content_limit comparison - - packfile: allow content-limit for cat-file - - packfile: move sizep computation - "git cat-file --batch" has been optimized. +* rj/test-sanitize-leak-log-fix (2024-07-11) 2 commits + (merged to 'next' on 2024-07-11 at 9961f42025) + + test-lib: GIT_TEST_SANITIZE_LEAK_LOG enabled by default + (merged to 'next' on 2024-07-08 at c7ee7d03e1) + + test-lib: fix GIT_TEST_SANITIZE_LEAK_LOG - Needs review. - source: <20240715003519.2671385-1-e@80x24.org> + Tests that use GIT_TEST_SANITIZE_LEAK_LOG feature got their exit + status inverted, which has been corrected. + source: + source: -* jc/document-use-of-local (2024-07-15) 1 commit - - doc: note that AT&T ksh does not work with our test suite +* tb/doc-max-tree-depth-fix (2024-07-17) 1 commit + (merged to 'next' on 2024-07-17 at cdfc7a4f7b) + + Documentation: fix default value for core.maxTreeDepth Doc update. - - Needs review. - source: + source: <57610d9ca635b6c76b9af5b3d3f346a9bc7621be.1721222249.git.me@ttaylorr.com> -* jt/doc-post-receive-hook-update (2024-07-15) 1 commit - - doc: clarify post-receive hook behavior +* tb/pseudo-merge-reachability-bitmap (2024-07-17) 1 commit + (merged to 'next' on 2024-07-17 at f11cc8586a) + + Documentation/gitpacking: make sample configs listing blocks Doc update. + source: <20240717105432.2801097-1-martin.agren@gmail.com> - Will merge to 'next'. - source: <20240714194626.29512-2-jltobler@gmail.com> - +-------------------------------------------------- +[New Topics] -* ch/refs-without-the-repository-fix (2024-07-16) 1 commit - - refs: correct the version numbers in a comment +* rj/make-cleanup (2024-07-18) 2 commits + - config.mak.uname: remove unused uname_P variable + - Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGS - Comment fix. + A build tweak knob has been simplified by not setting the value + that is already the default; another unused one has been removed. Will merge to 'next'. - source: <20240716095544.65931-1-list@eworm.de> - - -* jc/reflog-expire-lookup-commit-fix (2024-07-16) 1 commit - - Revert "reflog expire: don't use lookup_commit_reference_gently()" - - "git reflog expire" failed to honor annotated tags when computing - reachable commits. - - Needs review. - source: + source: <0d132370-3e07-4332-bcfb-c4450100d736@ramsayjones.plus.com> -------------------------------------------------- [Stalled] @@ -338,7 +241,7 @@ Release tarballs are available at: source: <20240614095136.12052-1-chandrapratap3519@gmail.com> -* tb/incremental-midx-part-1 (2024-06-07) 19 commits +* tb/incremental-midx-part-1 (2024-07-17) 19 commits - midx: implement support for writing incremental MIDX chains - t/t5313-pack-bounds-checks.sh: prepare for sub-directories - t: retire 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' @@ -362,7 +265,7 @@ Release tarballs are available at: Incremental updates of multi-pack index files. Needs review. - source: + source: * pp/add-parse-range-unit-test (2024-05-27) 1 commit @@ -390,6 +293,53 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] +* ew/cat-file-optim (2024-07-15) 10 commits + - cat-file: use writev(2) if available + - cat-file: batch_write: use size_t for length + - cat-file: batch-command uses content_limit + - object_info: content_limit only applies to blobs + - packfile: packed_object_info avoids packed_to_object_type + - cat-file: use delta_base_cache entries directly + - packfile: inline cache_or_unpack_entry + - packfile: fix off-by-one in content_limit comparison + - packfile: allow content-limit for cat-file + - packfile: move sizep computation + + "git cat-file --batch" has been optimized. + + Needs review. + source: <20240715003519.2671385-1-e@80x24.org> + + +* jc/document-use-of-local (2024-07-15) 1 commit + - doc: note that AT&T ksh does not work with our test suite + + Doc update. + + Needs review. + source: + + +* 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 + + Doc update. + + Will cook in 'next'. + source: <20240715183739.7808-1-jltobler@gmail.com> + + +* jc/reflog-expire-lookup-commit-fix (2024-07-16) 1 commit + - Revert "reflog expire: don't use lookup_commit_reference_gently()" + + "git reflog expire" failed to honor annotated tags when computing + reachable commits. + + Needs review. + source: + + * es/doc-platform-support-policy (2024-07-12) 1 commit - Documentation: add platform support policy @@ -401,50 +351,19 @@ Release tarballs are available at: source: <20240711232413.693444-1-emilyshaffer@google.com> -* js/var-git-shell-path (2024-07-13) 7 commits - (merged to 'next' on 2024-07-15 at 2e5b0eea39) - + var(win32): do report the GIT_SHELL_PATH that is actually used - + run-command: declare the `git_shell_path()` function globally - + run-command(win32): resolve the path to the Unix shell early - + mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too - + win32: override `fspathcmp()` with a directory separator-aware version - + strvec: declare the `strvec_push_nodup()` function globally - + run-command: refactor getting the Unix shell path into its own function - - "git var GIT_SHELL_PATH" should report the path to the shell used - to spawn external commands, but it didn't do so on Windows, which - has been corrected. - - Will merge to 'master'. - source: - - -* kn/ci-clang-format (2024-07-15) 7 commits +* kn/ci-clang-format (2024-07-18) 6 commits + - 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: replace deprecated option with 'SpacesInParens' - - clang-format: ensure files end with newlines - clang-format: avoid spacing around bitfield colon - clang-format: indent preprocessor directives after hash A CI job that use clang-format to check coding style issues in new code has been added. - Needs review response. - cf. - source: <20240715093047.49321-1-karthik.188@gmail.com> - - -* ps/doc-http-empty-cookiefile (2024-07-11) 1 commit - (merged to 'next' on 2024-07-13 at 801dcb5a35) - + doc: update http.cookieFile with in-memory cookie processing - - What happens when http.cookieFile gets the special value "" has - been clarified in the documentation.. - - Will merge to 'master'. - source: + Will merge to 'next'. + source: <20240718081605.452366-1-karthik.188@gmail.com> * rj/add-p-pager (2024-07-15) 4 commits @@ -456,32 +375,11 @@ Release tarballs are available at: A 'P' command to "git add -p" that passes the patch hunk to the pager has been added. - Needs fixing CI breakage. - cf. + Expecting a (hopefully small and final) reroll. + cf. <2b57479c-29c8-4a6e-b7b0-1309395cfbd9@gmail.com> source: -* js/unit-test-oidtree-cmake-fix (2024-07-12) 1 commit - (merged to 'next' on 2024-07-15 at d7aac9004c) - + cmake: fix build of `t-oidtree` - - Build fix. - - Will merge to 'master'. - source: - - -* kn/push-empty-fix (2024-07-12) 1 commit - (merged to 'next' on 2024-07-13 at 74598adb55) - + builtin/push: call set_refspecs after validating remote - - "git push '' HEAD:there" used to hit a BUG(); it has been corrected - to die with "fatal: bad repository ''". - - Will merge to 'master'. - source: <20240711093954.20317-1-karthik.188@gmail.com> - - * ad/merge-with-diff-algorithm (2024-07-13) 1 commit (merged to 'next' on 2024-07-16 at 90fe5aff4d) + merge-recursive: honor diff.algorithm @@ -489,22 +387,10 @@ Release tarballs are available at: Many Porcelain commands that internally use the merge machinery were taught to consistently honor the diff.algorithm configuration. - Will merge to 'master'. + Will cook in 'next'. source: -* jc/http-cookiefile (2024-07-09) 1 commit - (merged to 'next' on 2024-07-11 at abdd5711d2) - + http.c: cookie file tightening - - The http.cookieFile and http.saveCookies configuration variables - have a few values that need to be avoided, which are now ignored - with warning messages. - - Will merge to 'master'. - source: - - * jc/checkout-no-op-switch-errors (2024-07-02) 1 commit - checkout: special case error messages during noop switching @@ -513,7 +399,7 @@ Release tarballs are available at: correct, but found confusing by some users. It now says that the user needs to give pathspec to specify what paths to checkout. - Needs review. + Will merge to 'next'. source: @@ -528,7 +414,7 @@ Release tarballs are available at: Another reftable test has been ported to use the unit test framework. - Will merge to 'next'? + Will merge to 'next'. source: <20240712055041.6476-1-chandrapratap3519@gmail.com> @@ -542,7 +428,7 @@ Release tarballs are available at: Unit test clean-up. - Will merge to 'master'. + Will cook in 'next'. source: <35b0ba6b-d485-44f2-a19f-3ce816f8b435@web.de> source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de> source: <1521ed89-989e-452b-b7fc-9e73672e0764@web.de> @@ -558,40 +444,6 @@ Release tarballs are available at: source: <20240711235159.5320-1-shyamthakkar001@gmail.com> -* jk/test-body-in-here-doc (2024-07-10) 10 commits - (merged to 'next' on 2024-07-11 at 854733cffc) - + t/.gitattributes: ignore whitespace in chainlint expect files - + t: convert some here-doc test bodies - + test-lib: allow test snippets as here-docs - + chainlint.pl: add tests for test body in heredoc - + chainlint.pl: recognize test bodies defined via heredoc - + chainlint.pl: check line numbers in expected output - + chainlint.pl: force CRLF conversion when opening input files - + chainlint.pl: do not spawn more threads than we have scripts - + chainlint.pl: only start threads if jobs > 1 - + chainlint.pl: add test_expect_success call to test snippets - - The test framework learns to take the test body not as a single - string but as a here-document. - - Will merge to 'master'. - source: <20240710083416.GA2060328@coredump.intra.peff.net> - - -* rj/test-sanitize-leak-log-fix (2024-07-11) 2 commits - (merged to 'next' on 2024-07-11 at 9961f42025) - + test-lib: GIT_TEST_SANITIZE_LEAK_LOG enabled by default - (merged to 'next' on 2024-07-08 at c7ee7d03e1) - + test-lib: fix GIT_TEST_SANITIZE_LEAK_LOG - - Tests that use GIT_TEST_SANITIZE_LEAK_LOG feature got their exit - status inverted, which has been corrected. - - Will merge to 'master'. - source: - source: - - * rs/unit-tests-test-run (2024-07-01) 6 commits - t-strbuf: use TEST_RUN - t-strvec: use TEST_RUN @@ -634,39 +486,3 @@ Release tarballs are available at: Reverted out of 'next'. source: <20240710093610.GA2076910@coredump.intra.peff.net> - - -* vd/mktree (2024-06-20) 17 commits - . mktree: remove entries when mode is 0 - . mktree: allow deeper paths in input - . mktree: optionally add to an existing tree - . mktree: add directory-file conflict hashmap - . mktree: use iterator struct to add tree entries to index - . mktree: create tree using an in-core index - . mktree: overwrite duplicate entries - . mktree: validate paths more carefully - . mktree: add a --literally option - . mktree.c: do not fail on mismatched submodule type - . mktree: use read_index_info to read stdin lines - . index-info.c: parse object type in provided in read_index_info - . index-info.c: return unrecognized lines to caller - . update-index: generalize 'read_index_info' - . mktree: use non-static tree_entry array - . mktree: rename treeent to tree_entry - . mktree: use OPT_BOOL - - "git mktree" has been rewritten, taking advantage of the cache-tree - API. - - Retracted for now. - cf. <047b889e-fa6d-4c4a-b486-0bc80922c4ca@github.com> - source: - - -* mh/userdiff-typescript (2024-07-15) 1 commit - . userdiff: add builtin diff driver for TypeScript language - - Retracted for now. - cf. <20240716193344.bjb62zsfnrfw3ngf@archP14s> - source: -