From: Junio C Hamano Date: Tue, 16 Jul 2024 23:04:18 +0000 (-0700) Subject: What's cooking (2024/07 #05) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9f280fb78f448e2292ef6760888302d265f66d8;p=thirdparty%2Fgit.git What's cooking (2024/07 #05) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 2404d13170..4bd0221984 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, #04; Fri, 12) -X-master-at: a7dae3bdc8b516d36f630b12bb01e853a667e0d9 -X-next-at: eb743b3ca22675107e6ba730058d59d2cf3cb6fa +Subject: What's cooking in git.git (Jul 2024, #05; Tue, 16) +X-master-at: 04f5a52757cd92347271e24f7cbdfe15dafce3b7 +X-next-at: 44c27ab58a06e5c08647e891ceb89879d1423b71 Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Jul 2024, #04; Fri, 12) +What's cooking in git.git (Jul 2024, #05; Tue, 16) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,8 +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). -Git 2.46-rc0 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 repositories have only a subset of branches. @@ -50,104 +48,248 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* as/pathspec-h-typofix (2024-07-01) 1 commit - (merged to 'next' on 2024-07-02 at ae7cee4189) - + pathspec: fix typo "glossary-context.txt" -> "glossary-content.txt" +* 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 - Typofix. - source: <20240629193137.54037-1-abhijeet.nkt@gmail.com> + GitWeb update to use committer date consistently in rss/atom feeds. + source: <20240707184813.33166-1-080ariel@gmail.com> -* rs/simplify-submodule-helper-super-prefix-invocation (2024-07-01) 1 commit - (merged to 'next' on 2024-07-02 at 06e1677920) - + submodule--helper: use strvec_pushf() for --super-prefix +* 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 - Code clean-up. - source: + "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> --------------------------------------------------- -[New Topics] -* es/doc-platform-support-policy (2024-07-12) 1 commit - - Documentation: add platform support policy +* 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 policy document that describes platform support levels and - expectation on platform stakeholders has been introduced. + A handful of entries are added to the GitFAQ document. + source: <20240709233746.445860-1-sandals@crustytoothpaste.net> - What's the doneness of this one? - source: <20240711232413.693444-1-emilyshaffer@google.com> +* bc/http-proactive-auth (2024-07-09) 1 commit + (merged to 'next' on 2024-07-10 at 29b050bf0e) + + http: allow authenticating proactively -* js/var-git-shell-path (2024-07-12) 7 commits - - 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 + 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> - "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 + +* 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 + + 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> + + +* 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 + + A test in reftable library has been rewritten using the unit test + framework. + cf. + source: <20240702074906.5587-1-chandrapratap3519@gmail.com> + + +* 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 + + 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: + + +* 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 + + The "ort" merge backend saw one bugfix for a crash that happens + when inner merge gets killed, and assorted code clean-ups. + source: + + +* 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 + + An existing test of oidmap API has been rewritten with the + unit-test framework. + source: <20240703062958.23262-2-shyamthakkar001@gmail.com> + + +* 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 + + "git push" that pushes only deletion gave an unnecessary and + harmless error message when push negotiation is configured, which has been corrected. + source: - Will merge to 'next'. - 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 -* kn/ci-clang-format (2024-07-11) 8 commits - - 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 braces on simple single-statement bodies - - 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 + Shell script clean-up. + source: - A CI job that use clang-format to check coding style issues in new - code has been added. - What's the doneness of this one? - source: <20240711083043.1732288-1-karthik.188@gmail.com> +* 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> -* ps/doc-http-empty-cookiefile (2024-07-11) 1 commit - - doc: update http.cookieFile with in-memory cookie processing - What happens when http.cookieFile gets the special value "" has - been clarified in the documentation.. +* mh/userdiff-typescript (2024-07-15) 1 commit + - userdiff: add builtin diff driver for TypeScript language - Will merge to 'next'. - source: + With known shortcomings. + cf. <20240716122112.zqauqgxmng2tk2j6@archP14s> + source: -* rj/add-p-pager (2024-07-12) 4 commits - - add-patch: render hunks through the pager - - pager: introduce wait_for_pager - - pager: do not close fd 2 unnecessarily - - add-patch: test for 'p' command +* 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: - A 'P' command to "git add -p" that passes the patch hunk to the - pager has been added. - Expecting a (hopefully small and final) reroll. - cf. <803b10ed-1cb3-4314-82c9-cf48d5d0bb90@gmail.com> - source: <2653fb37-c8a8-49b1-a804-4be6654a2cad@gmail.com> +* 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> -* js/unit-test-oidtree-cmake-fix (2024-07-12) 1 commit - - cmake: fix build of `t-oidtree` - Build fix. +* 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> + + +* 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> + + +* 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: + +-------------------------------------------------- +[New Topics] + +* 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 + - doc: clarify post-receive hook behavior + + Doc update. Will merge to 'next'. - source: + source: <20240714194626.29512-2-jltobler@gmail.com> + + +* ch/refs-without-the-repository-fix (2024-07-16) 1 commit + - refs: correct the version numbers in a comment + + Comment fix. + + 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: -------------------------------------------------- [Stalled] -* cp/unit-test-reftable-tree (2024-06-13) 5 commits +* cp/unit-test-reftable-tree (2024-07-16) 6 commits + - SQUASH????? - 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 @@ -158,26 +300,26 @@ Release tarballs are available at: framework. Needs review. - source: <20240612130217.8877-1-chandrapratap3519@gmail.com> + source: <20240716075641.4264-1-chandrapratap3519@gmail.com> -* sj/ref-fsck (2024-07-10) 10 commits +* sj/ref-fsck (2024-07-15) 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 - - builtin/refs: add verify subcommand and verbose_refs for "fsck_options" + - git refs: add verify subcommand - refs: set up ref consistency check infrastructure - fsck: add refs-related error report function - - fsck: add a unified interface for reporting fsck messages - 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 review. - source: + source: * cp/unit-test-reftable-pq (2024-06-14) 7 commits @@ -223,32 +365,6 @@ Release tarballs are available at: source: -* 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. - - Will merge to 'next'? - source: - - * pp/add-parse-range-unit-test (2024-05-27) 1 commit - apply: add unit tests for parse_range @@ -274,35 +390,107 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] -* 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 +* es/doc-platform-support-policy (2024-07-12) 1 commit + - Documentation: add platform support policy + + A policy document that describes platform support levels and + expectation on platform stakeholders has been introduced. + + Needs review response. + cf. + source: <20240711232413.693444-1-emilyshaffer@google.com> - Shell script clean-up. + +* 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: + source: + + +* kn/ci-clang-format (2024-07-15) 7 commits + - 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: + + +* rj/add-p-pager (2024-07-15) 4 commits + - add-patch: render hunks through the pager + - pager: introduce wait_for_pager + - pager: do not close fd 2 unnecessarily + - add-patch: test for 'p' command + + A 'P' command to "git add -p" that passes the patch hunk to the + pager has been added. + + Needs fixing CI breakage. + cf. + 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 - - builtin/push: call set_refspecs after validating remote + (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 'next'. + Will merge to 'master'. source: <20240711093954.20317-1-karthik.188@gmail.com> -* ad/merge-with-diff-algorithm (2024-07-10) 1 commit - (merged to 'next' on 2024-07-11 at 2a221341d9) +* ad/merge-with-diff-algorithm (2024-07-13) 1 commit + (merged to 'next' on 2024-07-16 at 90fe5aff4d) + merge-recursive: honor diff.algorithm Many Porcelain commands that internally use the merge machinery were taught to consistently honor the diff.algorithm configuration. Will merge to 'master'. - source: + source: * jc/http-cookiefile (2024-07-09) 1 commit @@ -317,18 +505,6 @@ Release tarballs are available at: source: -* jk/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit - (merged to 'next' on 2024-07-11 at cec8ebb668) - + add-patch: handle splitting hunks with diff.suppressBlankEmpty - - When the diff.suppressBlankEmpty configuration variable is set, - "git add -p" failed to process a patch with an unmodified empty - line, which has been corrected. - - Will merge to 'master'. - source: <20240710093610.GA2076910@coredump.intra.peff.net> - - * jc/checkout-no-op-switch-errors (2024-07-02) 1 commit - checkout: special case error messages during noop switching @@ -341,31 +517,6 @@ Release tarballs are available at: 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 - - "git push" that pushes only deletion gave an unnecessary and - harmless error message when push negotiation is configured, which - has been corrected. - - Will merge to 'master'. - source: - - -* 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. - - Will merge to 'master'. - source: <20240709233746.445860-1-sandals@crustytoothpaste.net> - - * cp/unit-test-reftable-merged (2024-07-12) 7 commits - t-reftable-merged: add test for REFTABLE_FORMAT_ERROR - t-reftable-merged: use reftable_ref_record_equal to compare ref records @@ -377,61 +528,24 @@ Release tarballs are available at: Another reftable test has been ported to use the unit test framework. - Looking good. + Will merge to 'next'? source: <20240712055041.6476-1-chandrapratap3519@gmail.com> -* 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 - - 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. - - Will merge to 'master'. - source: - - -* 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. - - Will merge to 'master'. - source: <20240707184813.33166-1-080ariel@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. - - Will merge to 'master'. - source: <4e7893f5-2dd9-46cf-8a64-cf780f4e1730@web.de> - - -* rs/t-strvec-use-test-msg (2024-07-06) 1 commit +* 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() Unit test clean-up. Will merge to 'master'. + source: <35b0ba6b-d485-44f2-a19f-3ce816f8b435@web.de> source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de> - - -* 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. - - Will merge to 'master'. - source: + source: <1521ed89-989e-452b-b7fc-9e73672e0764@web.de> * gt/unit-test-hashmap (2024-07-12) 1 commit @@ -444,27 +558,6 @@ Release tarballs are available at: source: <20240711235159.5320-1-shyamthakkar001@gmail.com> -* 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. - - Will merge to 'master'. - source: - - -* 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 - - An existing test of oidmap API has been rewritten with the - unit-test framework. - - Will merge to 'master'. - source: <20240703062958.23262-2-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 @@ -485,26 +578,6 @@ Release tarballs are available at: source: <20240710083416.GA2060328@coredump.intra.peff.net> -* 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. - - Will merge to 'master'. - source: <86427b9e-9574-4e61-890a-691779a8da82@gmail.com> - - -* 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. - - Will merge to 'master'. - source: <23d41343-54fd-46c6-9d78-369e8009fa0b@gmail.com> - - * 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 @@ -534,75 +607,6 @@ Release tarballs are available at: source: <85b6b8a9-ee5f-42ab-bcbc-49976b30ef33@web.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 - - A test in reftable library has been rewritten using the unit test - framework. - - Will merge to 'master'. - cf. - source: <20240702074906.5587-1-chandrapratap3519@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. - - Will merge to 'master'. - source: <20240626190801.68472-1-abhijeet.nkt@gmail.com> - - -* 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 - - Address-looking strings found on the trailer are now placed on the - Cc: list after running through sanitize_address. - - Will merge to 'master'. - source: <20240701090115.56957-1-csokas.bence@prolan.hu> - - -* 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. - - Will merge to 'master'. - source: <20240626205355.GA1009060@coredump.intra.peff.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. - - Will merge to 'master'. - source: <20240710000155.947377-2-sandals@crustytoothpaste.net> - - * jc/patch-id (2024-06-21) 5 commits - patch-id: tighten code to detect the patch header - patch-id: rewrite code that detects the beginning of a patch @@ -617,21 +621,52 @@ Release tarballs are available at: Needs review. source: <20240621231826.3280338-1-gitster@pobox.com> +-------------------------------------------------- +[Discarded] -* 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/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit + (merged to 'next' on 2024-07-11 at cec8ebb668) + + add-patch: handle splitting hunks with diff.suppressBlankEmpty - The "ort" merge backend saw one bugfix for a crash that happens - when inner merge gets killed, and assorted code clean-ups. + When the diff.suppressBlankEmpty configuration variable is set, + "git add -p" failed to process a patch with an unmodified empty + line, which has been corrected. + + 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: - Will merge to 'master'. - source: