diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-03-04 14:35:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-03-04 14:35:56 -0800 |
commit | 1b60a6f7b5d61875186ac6915d548edf19d7d598 (patch) | |
tree | 6d48e94df22152e4b472cb5b26852d906f96eb53 | |
parent | 495ae5bc8a5f92f6bf83658484aca5ceb27948e6 (diff) | |
download | git-1b60a6f7b5d61875186ac6915d548edf19d7d598.tar.gz |
What's cooking (2024/03 #01)
-rw-r--r-- | whats-cooking.txt | 705 |
1 files changed, 359 insertions, 346 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt index 972fdbd06f..976f3d51c6 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 (Feb 2024, #09; Tue, 27) -X-master-at: 0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d -X-next-at: dc8dd223a70561ef1480098663d61af5531a1f47 +Subject: What's cooking in git.git (Mar 2024, #01; Mon, 4) +X-master-at: b387623c12f3f4a376e4d35a610fd3e55d7ea907 +X-next-at: de5f6a74cb92fb2d418f67c29f18e8f21f7e420c Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Feb 2024, #09; Tue, 27) +What's cooking in git.git (Mar 2024, #01; Mon, 4) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -48,177 +48,272 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* ba/credential-test-clean-fix (2024-02-15) 1 commit - (merged to 'next' on 2024-02-19 at 290708b10a) - + t/lib-credential: clean additional credential - (this branch is used by jk/t0303-clean.) +* cp/t9146-use-test-path-helpers (2024-02-14) 1 commit + (merged to 'next' on 2024-02-21 at 0b8356ef33) + + t9146: replace test -d/-e/-f with appropriate test_path_is_* function - Test clean-up. - source: <pull.1664.git.1707959036807.gitgitgadget@gmail.com> + Test script clean-up. + source: <pull.1661.v3.git.1707933048210.gitgitgadget@gmail.com> -* bb/completion-no-grep-into-awk (2024-02-16) 1 commit - (merged to 'next' on 2024-02-19 at 8373f95424) - + completion: use awk for filtering the config entries +* ds/doc-send-email-capitalization (2024-02-20) 1 commit + (merged to 'next' on 2024-02-21 at c4aac4b993) + + documentation: send-email: use camel case consistently - Some parts of command line completion script (in contrib/) have - been micro-optimized. - source: <20240216171046.927552-1-dev+git@drbeat.li> + Doc update. + source: <88f1fe08c3047e14090957093ee8d98b0f60cb6c.1708467601.git.dsimic@manjaro.org> -* cp/apply-core-filemode (2023-12-26) 3 commits - (merged to 'next' on 2024-02-07 at 089a3fbb86) - + apply: code simplification - + apply: correctly reverse patch's pre- and post-image mode bits - + apply: ignore working tree filemode when !core.filemode +* hs/rebase-not-in-progress (2024-02-21) 1 commit + (merged to 'next' on 2024-02-23 at ce53f5243f) + + rebase: make warning less passive aggressive - "git apply" on a filesystem without filemode support have learned - to take a hint from what is in the index for the path, even when - not working with the "--index" or "--cached" option, when checking - the executable bit match what is required by the preimage in the - patch. - cf. <xmqqzfwb53a9.fsf@gitster.g> - source: <20231226233218.472054-1-gitster@pobox.com> + Error message update. + source: <pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com> -* gt/at-is-synonym-for-head-in-add-patch (2024-02-13) 2 commits - (merged to 'next' on 2024-02-14 at cd901555d6) - + add -p tests: remove PERL prerequisites - + add-patch: classify '@' as a synonym for 'HEAD' +* ja/doc-placeholders-markup-rules (2024-02-21) 1 commit + (merged to 'next' on 2024-02-23 at b6761ceeac) + + doc: clarify the format of placeholders - Teach "git checkout -p" and friends that "@" is a synonym for - "HEAD". - source: <20240211202035.7196-2-shyamthakkar001@gmail.com> + The way placeholders are to be marked-up in documentation have been + specified; use "_<placeholder>_" to typeset the word inside a pair + of <angle-brakets> emphasized. + source: <pull.1671.git.1708550340094.gitgitgadget@gmail.com> -* jb/doc-interactive-singlekey-do-not-need-perl (2024-02-19) 1 commit - (merged to 'next' on 2024-02-19 at 9eda75497d) - + doc: remove outdated information about interactive.singleKey +* ja/docfixes (2024-02-20) 3 commits + (merged to 'next' on 2024-02-21 at 6d778ca672) + + doc: end sentences with full-stop + + doc: close unclosed angle-bracket of a placeholder in git-clone doc + + doc: git-rev-parse: enforce command-line description syntax - Doc clean-up. - source: <20240218030327.40453-1-julio.bacel@gmail.com> + Doc update. + source: <pull.1670.git.1708468374.gitgitgadget@gmail.com> -* jc/am-whitespace-doc (2024-02-14) 1 commit - (merged to 'next' on 2024-02-19 at 492f0f9174) - + doc: add shortcut to "am --whitespace=<action>" +* jc/doc-add-placeholder-fix (2024-02-21) 1 commit + (merged to 'next' on 2024-02-23 at 6950ff216b) + + doc: apply the new placeholder rules to git-add documentation - "git am --help" now tells readers what actions are available in - "git am --whitespace=<action>", in addition to saying that the - option is passed through to the underlying "git apply". - source: <xmqqplwyvqby.fsf@gitster.g> + Practice the new mark-up rule for <placeholders> with "git add" + documentation page. + source: <xmqqbk89molz.fsf@gitster.g> -* jc/t9210-lazy-fix (2024-02-08) 1 commit - (merged to 'next' on 2024-02-13 at fb61ca2fba) - + t9210: do not rely on lazy fetching to fail - (this branch is used by cc/rev-list-allow-missing-tips.) +* jw/remote-doc-typofix (2024-02-21) 1 commit + (merged to 'next' on 2024-02-23 at fe95873cfa) + + git-remote.txt: fix typo - Adjust use of "rev-list --missing" in an existing tests so that it - does not depend on a buggy failure mode. - source: <xmqq7cjemttr.fsf@gitster.g> + Docfix. + source: <20240221083554.5255-1-jwilk@jwilk.net> -* jk/t0303-clean (2024-02-19) 2 commits - (merged to 'next' on 2024-02-19 at f57b65215f) - + t0303: check that helper_test_clean removes all credentials - + Merge branch 'ba/credential-test-clean-fix' into jk/t0303-clean - (this branch uses ba/credential-test-clean-fix.) +* ps/difftool-dir-diff-exit-code (2024-02-20) 1 commit + (merged to 'next' on 2024-02-21 at a7bbef5a5f) + + git-difftool--helper: honor `--trust-exit-code` with `--dir-diff` - Test clean-up. - source: <20240217045814.GA539459@coredump.intra.peff.net> + "git difftool --dir-diff" learned to honor the "--trust-exit-code" + option; it used to always exit with 0 and signalled success. + Acked-by: David Aguilar <davvid@gmail.com> + cf. <CAJDDKr5+3jszG=psh=kUGDjNCeTDGPSS-qDuN=JAq-3ua=bNDg@mail.gmail.com> + source: <0fac668f8fc021af9f9c4df5134da59816307ccc.1708423309.git.ps@pks.im> -* kh/column-reject-negative-padding (2024-02-13) 2 commits - (merged to 'next' on 2024-02-14 at c30c08e495) - + column: guard against negative padding - + column: disallow negative padding +* ps/reflog-list (2024-02-21) 9 commits + (merged to 'next' on 2024-02-23 at 7413632239) + + builtin/reflog: introduce subcommand to list reflogs + + refs: stop resolving ref corresponding to reflogs + + refs: drop unused params from the reflog iterator callback + + refs: always treat iterators as ordered + + refs/files: sort merged worktree and common reflogs + + refs/files: sort reflogs returned by the reflog iterator + + dir-iterator: support iteration in sorted order + + dir-iterator: pass name to `prepare_next_entry_data()` directly + + Merge branch 'ps/reftable-backend' into ps/reflog-list - "git column" has been taught to reject negative padding value, as - it would lead to nonsense behaviour including division by zero. - source: <cover.1707839454.git.code@khaugsbakk.name> + "git reflog" learned a "list" subcommand that enumerates known reflogs. + source: <cover.1708518982.git.ps@pks.im> -* km/mergetool-vimdiff-layout-fallback (2024-02-19) 1 commit - (merged to 'next' on 2024-02-19 at bf7f086f05) - + mergetools: vimdiff: use correct tool's name when reading mergetool config +* tb/multi-pack-verbatim-reuse (2024-02-23) 1 commit + (merged to 'next' on 2024-02-23 at 8ee07f1da4) + + Documentation/config/pack.txt: fix broken AsciiDoc mark-up - Variants of vimdiff learned to honor mergetool.<variant>.layout settings. - source: <20240217162718.21272-1-kipras@kipras.org> + Docfix. + source: <72bb58e5f3b8a5a622394c5ff40426156e122580.1708720255.git.me@ttaylorr.com> + +-------------------------------------------------- +[New Topics] +* jk/upload-pack-bounded-resources (2024-02-28) 9 commits + (merged to 'next' on 2024-03-01 at b70b6f0913) + + upload-pack: free tree buffers after parsing + + upload-pack: use PARSE_OBJECT_SKIP_HASH_CHECK in more places + + upload-pack: always turn off save_commit_buffer + + upload-pack: disallow object-info capability by default + + upload-pack: accept only a single packfile-uri line + + upload-pack: use a strmap for want-ref lines + + upload-pack: use oidset for deepen_not list + + upload-pack: switch deepen-not list to an oid_array + + upload-pack: drop separate v2 "haves" array -* mh/libsecret-empty-password-fix (2024-02-19) 1 commit - (merged to 'next' on 2024-02-19 at b2e17695ca) - + libsecret: retrieve empty password + Originally merged to 'next' on 2024-02-29 - Credential helper based on libsecret (in contrib/) has been updated - to handle an empty password correctly. - source: <pull.1676.v2.git.git.1708375258296.gitgitgadget@gmail.com> + Various parts of upload-pack has been updated to bound the resource + consumption relative to the size of the repository to protect from + abusive clients. + Will merge to 'master'. + source: <20240228223700.GA1157826@coredump.intra.peff.net> -* ps/ref-tests-update-even-more (2024-02-15) 7 commits - (merged to 'next' on 2024-02-15 at 064b2b4089) - + t7003: ensure filter-branch prunes reflogs with the reftable backend - + t2011: exercise D/F conflicts with HEAD with the reftable backend - + t1405: remove unneeded cleanup step - + t1404: make D/F conflict tests compatible with reftable backend - + t1400: exercise reflog with gaps with reftable backend - + t0410: convert tests to use DEFAULT_REPO_FORMAT prereq - + t: move tests exercising the "files" backend - More tests that are marked as "ref-files only" have been updated to - improve test coverage of reftable backend. - source: <cover.1707985173.git.ps@pks.im> +* jk/upload-pack-v2-capability-cleanup (2024-02-29) 4 commits + (merged to 'next' on 2024-03-01 at 2750893db7) + + upload-pack: only accept packfile-uris if we advertised it + + upload-pack: use existing config mechanism for advertisement + + upload-pack: centralize setup of sideband-all config + + upload-pack: use repository struct to get config + Originally merged to 'next' on 2024-02-29 -* ps/reftable-backend (2024-02-07) 3 commits - (merged to 'next' on 2024-02-08 at ba1c4c52bb) - + refs/reftable: fix leak when copying reflog fails - (merged to 'next' on 2024-02-07 at 1115200acb) - + ci: add jobs to test with the reftable backend - + refs: introduce reftable backend - (this branch is used by kn/for-all-refs and ps/reflog-list.) + The upload-pack program, when talking over v2, accepted the + packfile-uris protocol extension from the client, even if it did + not advertise the capability, which has been corrected. - Integrate the reftable code into the refs framework as a backend. - source: <cover.1707288261.git.ps@pks.im> + Will merge to 'master'. + source: <20240228224625.GA1158651@coredump.intra.peff.net> -* ps/reftable-iteration-perf (2024-02-12) 7 commits - (merged to 'next' on 2024-02-12 at 6abaf58383) - + reftable/reader: add comments to `table_iter_next()` - + reftable/record: don't try to reallocate ref record name - + reftable/block: swap buffers instead of copying - + reftable/pq: allocation-less comparison of entry keys - + reftable/merged: skip comparison for records of the same subiter - + reftable/merged: allocation-less dropping of shadowed records - + reftable/record: introduce function to compare records by key - (this branch is used by ps/reftable-iteration-perf-part2.) +* es/config-doc-sort-sections (2024-02-29) 1 commit + (merged to 'next' on 2024-03-04 at 0752144ed7) + + docs: sort configuration variable groupings alphabetically - The code to iterate over refs with the reftable backend has seen - some optimization. - source: <cover.1707726654.git.ps@pks.im> + Doc updates. + Will merge to 'master'. + source: <20240229190229.20222-1-ericsunshine@charter.net> -* rj/tag-column-fix (2024-02-14) 1 commit - (merged to 'next' on 2024-02-19 at 9aa52b4ffb) - + tag: error when git-column fails - "git tag --column" failed to check the exit status of its "git - column" invocation, which has been corrected. - source: <59df085d-0de8-45b1-9b8b-c69e91e56a1f@gmail.com> +* kh/doc-dashed-commands-have-not-worked-for-a-long-time (2024-03-01) 1 commit + (merged to 'next' on 2024-03-04 at 7e070c67f9) + + gitcli: drop mention of “non-dashed form” + Doc update. -* rs/use-xstrncmpz (2024-02-12) 1 commit - (merged to 'next' on 2024-02-12 at 37e5f0fc14) - + use xstrncmpz() + Will merge to 'master'. + source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@khaugsbakk.name> - Code clean-up. - source: <954b75d0-1504-4f57-b34e-e770a4b7b3ea@web.de> + +* jc/xwrite-cleanup (2024-03-02) 3 commits + - repack: check error writing to pack-objects subprocess + - sideband: avoid short write(2) + - unpack: replace xwrite() loop with write_in_full() + + Uses of xwrite() helper have been audited and updated for better + error checking and simpler code. + source: <20240302190348.3946569-1-gitster@pobox.com> + + +* jc/test-i18ngrep (2024-03-02) 1 commit + - test_i18ngrep: hard deprecate and forbid its use + + With release 2.44 we got rid of all uses of test_i18ngrep and there + is no in-flight topic that adds a new use of it. Make a call to + test_i18ngrep a hard failure, so that we can remove it at the end + of this release cycle. + + Comments? + source: <xmqq5xy4zhdc.fsf@gitster.g> + + +* gt/core-bare-in-templates (2024-03-04) 1 commit + - setup: remove unnecessary variable + + Code simplification. + + Will merge to 'next'? + source: <20240304151811.511780-1-shyamthakkar001@gmail.com> + + +* so/clean-dry-run-without-force (2024-03-04) 2 commits + - clean: further clean-up of implementation around "--force" + - clean: improve -n and -f implementation and documentation + + The implementation in "git clean" that makes "-n" and "-i" ignore + clean.requireForce has been simplified, together with the + documentation. + + Will merge to 'next'. + source: <87le6ziqzb.fsf_-_@osv.gnss.ru> + source: <20240303220600.2491792-1-gitster@pobox.com> + + +* jh/trace2-missing-def-param-fix (2024-03-04) 4 commits + - trace2: remove unneeded calls to generate 'def_param' set + - trace2: emit 'def_param' set with 'cmd_name' event + - trace2: avoid emitting 'def_param' set more than once + - t0211: demonstrate missing 'def_param' events for certain commands + + Some trace2 events that lacked def_param have learned to show it, + enriching the output. + + Needs review. + source: <pull.1679.git.1709566808.gitgitgadget@gmail.com> + + +* ps/reftable-stack-tempfile (2024-03-04) 4 commits + - reftable/stack: register compacted tables as tempfiles + - reftable/stack: register lockfiles during compaction + - reftable/stack: register new tables as tempfiles + - lockfile: report when rollback fails + + The code in reftable backend that creates new table files works + better with the tempfile framework to avoid leaving cruft after a + failure. + + Needs review. + source: <cover.1709549619.git.ps@pks.im> + + +* rs/opt-parse-long-fixups (2024-03-03) 6 commits + - parse-options: rearrange long_name matching code + - parse-options: normalize arg and long_name before comparison + - parse-options: detect ambiguous self-negation + - parse-options: factor out register_abbrev() and struct parsed_option + - parse-options: set arg of abbreviated option lazily + - parse-options: recognize abbreviated negated option with arg + + The parse-options code that deals with abbreviated long option + names have been cleaned up. + + Needs review. + source: <20240303121944.20627-1-l.s.r@web.de> + + +* sj/t9117-path-is-file (2024-03-04) 1 commit + (merged to 'next' on 2024-03-04 at de5f6a74cb) + + t9117: prefer test_path_* helper functions + + GSoC practice to replace "test -f" with "test_path_is_file". + + Will merge to 'master'. + source: <20240304095436.56399-2-shejialuo@gmail.com> + + +* vm/t7301-use-test-path-helpers (2024-03-04) 1 commit + - t7301: use test_path_is_(missing|file) + + GSoC practice to replace "test -f" with "test_path_is_file". + + Will merge to 'next'? + source: <20240304171732.64457-2-vincenzo.mezzela@gmail.com> -------------------------------------------------- -[New Topics] +[Cooking] -* cw/git-std-lib (2024-02-22) 3 commits +* 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 @@ -229,48 +324,47 @@ Release tarballs are available at: source: <cover.1696021277.git.jonathantanmy@google.com> -* js/merge-base-with-missing-commit (2024-02-27) 11 commits - - repo_get_merge_bases_many_dirty(): pass on errors from `merge_bases_many()` - - repo_get_merge_bases_many(): pass on errors from `merge_bases_many()` - - get_octopus_merge_bases(): pass on errors from `merge_bases_many()` - - repo_get_merge_bases(): pass on errors from `merge_bases_many()` - - get_merge_bases_many_0(): pass on errors from `merge_bases_many()` - - merge_bases_many(): pass on errors from `paint_down_to_common()` - - commit-reach: start reporting errors in `paint_down_to_common()` - - Prepare `paint_down_to_common()` for handling shallow commits - - Start reporting missing commits in `repo_in_merge_bases_many()` - - Prepare `repo_in_merge_bases_many()` to optionally expect missing commits - - paint_down_to_common: plug two memory leaks +* js/merge-base-with-missing-commit (2024-02-29) 11 commits + (merged to 'next' on 2024-03-01 at 3e3eabaee9) + + commit-reach(repo_get_merge_bases_many_dirty): pass on errors + + commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors + + commit-reach(get_octopus_merge_bases): pass on "missing commits" errors + + commit-reach(repo_get_merge_bases): pass on "missing commits" errors + + commit-reach(get_merge_bases_many_0): pass on "missing commits" errors + + commit-reach(merge_bases_many): pass on "missing commits" errors + + commit-reach(paint_down_to_common): start reporting errors + + commit-reach(paint_down_to_common): prepare for handling shallow commits + + commit-reach(repo_in_merge_bases_many): report missing commits + + commit-reach(repo_in_merge_bases_many): optionally expect missing commits + + commit-reach(paint_down_to_common): plug two memory leaks - Make sure failure return from merge_bases_many() is properly caught. + Originally merged to 'next' on 2024-02-29 - Needs review. - source: <pull.1657.v3.git.1709040497.gitgitgadget@gmail.com> - - -* tb/multi-pack-verbatim-reuse (2024-02-23) 1 commit - (merged to 'next' on 2024-02-23 at 8ee07f1da4) - + Documentation/config/pack.txt: fix broken AsciiDoc mark-up + Make sure failure return from merge_bases_many() is properly caught. - Docfix. + Needs an incremental fix-up. + cf.<20240301065805.GB2680308@coredump.intra.peff.net> + source: <pull.1657.v4.git.1709113457.gitgitgadget@gmail.com> - Will merge to 'master'. - source: <72bb58e5f3b8a5a622394c5ff40426156e122580.1708720255.git.me@ttaylorr.com> +* eg/add-uflags (2024-02-29) 1 commit + (merged to 'next' on 2024-03-01 at 5dbc997561) + + add: use unsigned type for collection of bits -* eg/add-uflags (2024-02-24) 1 commit - - add: use unsigned type for collection of bits + Originally merged to 'next' on 2024-02-29 Code clean-up practice. - cf. <CAP8UFD3qR8E0gvUQtzzkLPWv4Db45kFS4pEqHKQr5siciVJ-zQ@mail.gmail.com> - source: <20240224112638.72257-2-giganteeugenio2@gmail.com> + Will merge to 'master'. + source: <20240229194444.8499-2-giganteeugenio2@gmail.com> * jc/doc-compat-util (2024-02-27) 1 commit - (merged to 'next' on 2024-02-27 at a838805d8c) + (merged to 'next' on 2024-03-01 at 89b76c65d7) + doc: clarify the wording on <git-compat-util.h> requirement + Originally merged to 'next' on 2024-02-27 + Clarify wording in the CodingGuidelines that requires <git-compat-util.h> to be the first header file. @@ -279,9 +373,11 @@ Release tarballs are available at: * jc/no-include-of-compat-util-from-headers (2024-02-24) 1 commit - (merged to 'next' on 2024-02-26 at 85857c09d9) + (merged to 'next' on 2024-03-01 at ebb921087e) + compat: drop inclusion of <git-compat-util.h> + Originally merged to 'next' on 2024-02-26 + Header file clean-up. Will merge to 'master'. @@ -289,11 +385,13 @@ Release tarballs are available at: * jk/reflog-special-cases-fix (2024-02-26) 3 commits - (merged to 'next' on 2024-02-27 at e9fbe29d06) + (merged to 'next' on 2024-03-01 at 2b67f6e668) + read_ref_at(): special-case ref@{0} for an empty reflog + get_oid_basic(): special-case ref@{n} for oldest reflog entry + Revert "refs: allow @{n} to work with n-sized reflog" + Originally merged to 'next' on 2024-02-27 + The logic to access reflog entries by date and number had ugly corner cases at the boundaries, which have been cleaned up. @@ -302,9 +400,11 @@ Release tarballs are available at: * jk/textconv-cache-outside-repo-fix (2024-02-26) 1 commit - (merged to 'next' on 2024-02-26 at d4a81531ef) + (merged to 'next' on 2024-03-01 at 8508b83758) + userdiff: skip textconv caching when not in a repository + Originally merged to 'next' on 2024-02-26 + The code incorrectly attempted to use textconv cache when asked, even when we are not running in a repository, which has been corrected. @@ -314,9 +414,11 @@ Release tarballs are available at: * js/remove-cruft-files (2024-02-26) 1 commit - (merged to 'next' on 2024-02-26 at c6491c1c5d) + (merged to 'next' on 2024-03-01 at 63100a274b) + neue: remove a bogus empty file + Originally merged to 'next' on 2024-02-26 + Remove an empty file that shouldn't have been added in the first place. @@ -325,20 +427,25 @@ Release tarballs are available at: * jt/commit-redundant-scissors-fix (2024-02-27) 2 commits - - commit: unify logic to avoid multiple scissors lines when merging - - commit: avoid redundant scissor line with --cleanup=scissors -v + (merged to 'next' on 2024-03-01 at e5983498f1) + + commit: unify logic to avoid multiple scissors lines when merging + + commit: avoid redundant scissor line with --cleanup=scissors -v + + Originally merged to 'next' on 2024-02-29 "git commit -v --cleanup=scissors" used to add the scissors line twice in the log message buffer, which has been corrected. - Comments? + Will merge to 'master'. source: <Zd2eLxPelxvP8FDk@localhost> * pb/ort-make-submodule-conflict-message-an-advice (2024-02-26) 1 commit - (merged to 'next' on 2024-02-27 at abe2ab5ed7) + (merged to 'next' on 2024-03-01 at df880cde2e) + merge-ort: turn submodule conflict suggestions into an advice + Originally merged to 'next' on 2024-02-27 + When a merge conflicted at a submodule, merge-ort backend used to unconditionally give a lengthy message to suggest how to resolve it. Now the message can be squelched as an advice message. @@ -359,9 +466,11 @@ Release tarballs are available at: * rs/fetch-simplify-with-starts-with (2024-02-26) 1 commit - (merged to 'next' on 2024-02-27 at 84bba0a921) + (merged to 'next' on 2024-03-01 at 000e015fff) + fetch: convert strncmp() with strlen() to starts_with() + Originally merged to 'next' on 2024-02-27 + Code simplification. Will merge to 'master'. @@ -369,10 +478,12 @@ Release tarballs are available at: * rs/name-rev-with-mempool (2024-02-26) 2 commits - (merged to 'next' on 2024-02-27 at b10b58ad64) + (merged to 'next' on 2024-03-01 at d53eac1836) + name-rev: use mem_pool_strfmt() + mem-pool: add mem_pool_strfmt() + Originally merged to 'next' on 2024-02-27 + Many small allocations "git name-rev" makes have been updated to allocate from a mem-pool. @@ -381,30 +492,36 @@ Release tarballs are available at: * rs/submodule-prefix-simplify (2024-02-26) 1 commit - (merged to 'next' on 2024-02-27 at c6051f9f6b) + (merged to 'next' on 2024-03-01 at 05d4d90201) + submodule: use strvec_pushf() for --submodule-prefix + Originally merged to 'next' on 2024-02-27 + Code simplification. Will merge to 'master'. source: <8cd983fb-32b9-41c6-a9e7-a485b190488c@web.de> -* rs/t-ctype-simplify (2024-02-26) 3 commits - - t-ctype: do one test per class and char - - t-ctype: avoid duplicating class names - - t-ctype: allow NUL anywhere in the specification string +* rs/t-ctype-simplify (2024-03-03) 4 commits + (merged to 'next' on 2024-03-04 at 9bd84a8877) + + t-ctype: avoid duplicating class names + + t-ctype: align output of i + + t-ctype: simplify EOF check + + t-ctype: allow NUL anywhere in the specification string Code simplification to one unit-test program. - Comments? - source: <20240225112722.89221-1-l.s.r@web.de> + Will merge to 'master'. + source: <20240303101330.20187-1-l.s.r@web.de> * sg/upload-pack-error-message-fix (2024-02-26) 1 commit - (merged to 'next' on 2024-02-27 at 7cd7a4c4d8) + (merged to 'next' on 2024-03-01 at b94664a7a0) + upload-pack: don't send null character in abort message to the client + Originally merged to 'next' on 2024-02-27 + An error message from "git upload-pack", which responds to "git fetch" requests, had a trialing NUL in it, which has been corrected. @@ -414,9 +531,11 @@ Release tarballs are available at: * ak/rebase-autosquash (2024-02-27) 1 commit - (merged to 'next' on 2024-02-27 at 1a37c5ed5e) + (merged to 'next' on 2024-03-01 at 57a34830b7) + rebase: fix typo in autosquash documentation + Originally merged to 'next' on 2024-02-27 + Typofix. Will merge to 'master'. @@ -424,25 +543,31 @@ Release tarballs are available at: * ps/reftable-repo-init-fix (2024-02-27) 2 commits - - refs/reftable: don't fail empty transactions in repo without HEAD - - Merge branch 'ps/remote-helper-repo-initialization-fix' into ps/reftable-repo-init-fix + (merged to 'next' on 2024-03-01 at abbf85051b) + + refs/reftable: don't fail empty transactions in repo without HEAD + + Merge branch 'ps/remote-helper-repo-initialization-fix' into ps/reftable-repo-init-fix (this branch uses ps/remote-helper-repo-initialization-fix.) + Originally merged to 'next' on 2024-02-29 + Clear the fallout from a fix for 2.44 regression. - Will merge to 'next'? + Will merge to 'master'. source: <95be968e10bd02c64448786e690bbefe5c082577.1709041721.git.ps@pks.im> * ps/remote-helper-repo-initialization-fix (2024-02-27) 1 commit - - builtin/clone: allow remote helpers to detect repo + (merged to 'next' on 2024-03-01 at 7b79ffbd8f) + + builtin/clone: allow remote helpers to detect repo (this branch is used by ps/reftable-repo-init-fix.) + Originally merged to 'next' on 2024-02-29 + A custom remote helper no longer cannot access the newly created repository during "git clone", which is a regression in Git 2.44. This has been corrected. - Will merge to 'next'? + Will merge to 'master'. source: <9d888adf92e9a8af7c18847219f97d3e595e3e36.1709041721.git.ps@pks.im> @@ -455,84 +580,6 @@ Release tarballs are available at: Comments? source: <pull.1678.git.1709042783847.gitgitgadget@gmail.com> --------------------------------------------------- -[Cooking] - -* ps/difftool-dir-diff-exit-code (2024-02-20) 1 commit - (merged to 'next' on 2024-02-21 at a7bbef5a5f) - + git-difftool--helper: honor `--trust-exit-code` with `--dir-diff` - - "git difftool --dir-diff" learned to honor the "--trust-exit-code" - option; it used to always exit with 0 and signalled success. - - Will merge to 'master'. - source: <0fac668f8fc021af9f9c4df5134da59816307ccc.1708423309.git.ps@pks.im> - - -* ds/doc-send-email-capitalization (2024-02-20) 1 commit - (merged to 'next' on 2024-02-21 at c4aac4b993) - + documentation: send-email: use camel case consistently - - Doc update. - - Will merge to 'master'. - source: <88f1fe08c3047e14090957093ee8d98b0f60cb6c.1708467601.git.dsimic@manjaro.org> - - -* ja/docfixes (2024-02-20) 3 commits - (merged to 'next' on 2024-02-21 at 6d778ca672) - + doc: end sentences with full-stop - + doc: close unclosed angle-bracket of a placeholder in git-clone doc - + doc: git-rev-parse: enforce command-line description syntax - - Doc update. - - Will merge to 'master'. - source: <pull.1670.git.1708468374.gitgitgadget@gmail.com> - - -* hs/rebase-not-in-progress (2024-02-21) 1 commit - (merged to 'next' on 2024-02-23 at ce53f5243f) - + rebase: make warning less passive aggressive - - Error message update. - - Will merge to 'master'. - source: <pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com> - - -* jw/remote-doc-typofix (2024-02-21) 1 commit - (merged to 'next' on 2024-02-23 at fe95873cfa) - + git-remote.txt: fix typo - - Docfix. - - Will merge to 'master'. - source: <20240221083554.5255-1-jwilk@jwilk.net> - - -* ja/doc-placeholders-markup-rules (2024-02-21) 1 commit - (merged to 'next' on 2024-02-23 at b6761ceeac) - + doc: clarify the format of placeholders - - The way placeholders are to be marked-up in documentation have been - specified; use "_<placeholder>_" to typeset the word inside a pair - of <angle-brakets> emphasized. - - Will merge to 'master'. - source: <pull.1671.git.1708550340094.gitgitgadget@gmail.com> - - -* jc/doc-add-placeholder-fix (2024-02-21) 1 commit - (merged to 'next' on 2024-02-23 at 6950ff216b) - + doc: apply the new placeholder rules to git-add documentation - - Practice the new mark-up rule for <placeholders> with "git add" - documentation page. - - Will merge to 'master'. - source: <xmqqbk89molz.fsf@gitster.g> - * as/option-names-in-messages (2024-02-16) 5 commits - revision.c: trivial fix to message @@ -547,24 +594,6 @@ Release tarballs are available at: source: <20240216101647.28837-1-ash@kambanaria.org> -* ps/reflog-list (2024-02-21) 9 commits - (merged to 'next' on 2024-02-23 at 7413632239) - + builtin/reflog: introduce subcommand to list reflogs - + refs: stop resolving ref corresponding to reflogs - + refs: drop unused params from the reflog iterator callback - + refs: always treat iterators as ordered - + refs/files: sort merged worktree and common reflogs - + refs/files: sort reflogs returned by the reflog iterator - + dir-iterator: support iteration in sorted order - + dir-iterator: pass name to `prepare_next_entry_data()` directly - + Merge branch 'ps/reftable-backend' into ps/reflog-list - - "git reflog" learned a "list" subcommand that enumerates known reflogs. - - Will merge to 'master'. - source: <cover.1708518982.git.ps@pks.im> - - * jh/fsmonitor-icase-corner-case-fix (2024-02-26) 14 commits - fsmonitor: support case-insensitive events - fsmonitor: refactor bit invalidation in refresh callback @@ -589,7 +618,8 @@ Release tarballs are available at: source: <pull.1662.v3.git.1708983565.gitgitgadget@gmail.com> -* ps/reftable-iteration-perf-part2 (2024-02-14) 13 commits +* ps/reftable-iteration-perf-part2 (2024-03-04) 13 commits + - refs/reftable: precompute prefix length - reftable: allow inlining of a few functions - reftable/record: decode keys in place - reftable/record: reuse refname when copying @@ -602,23 +632,12 @@ Release tarballs are available at: - reftable/merged: advance subiter on subsequent iteration - reftable/merged: make `merged_iter` structure private - reftable/pq: use `size_t` to track iterator index - - Merge branch 'ps/reftable-iteration-perf' into ps/reftable-iteration-perf-part2 The code to iterate over refs with the reftable backend has seen some optimization. - Needs review. - source: <cover.1707895758.git.ps@pks.im> - - -* cp/t9146-use-test-path-helpers (2024-02-14) 1 commit - (merged to 'next' on 2024-02-21 at 0b8356ef33) - + t9146: replace test -d/-e/-f with appropriate test_path_is_* function - - Test script clean-up. - - Will merge to 'master'. - source: <pull.1661.v3.git.1707933048210.gitgitgadget@gmail.com> + Will merge to 'next'? + source: <cover.1709548907.git.ps@pks.im> * js/cmake-with-test-tool (2024-02-23) 2 commits @@ -633,7 +652,7 @@ Release tarballs are available at: * kn/for-all-refs (2024-02-23) 6 commits - (merged to 'next' on 2024-02-27 at aef2406cca) + (merged to 'next' on 2024-03-01 at 76a1297ace) + for-each-ref: add new option to include root refs + ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR' + refs: introduce `refs_for_each_include_root_refs()` @@ -641,25 +660,28 @@ Release tarballs are available at: + refs: introduce `is_pseudoref()` and `is_headref()` + Merge branch 'ps/reftable-backend' into kn/for-all-refs - "git for-each-ref" filters its output with prefixes given from the - command line, but it did not honor an empty string to mean "pass - everything", which has been corrected. + Originally merged to 'next' on 2024-02-27 + + "git for-each-ref" learned "--include-root-refs" option to show + even the stuff outside the 'refs/' hierarchy. Will merge to 'master'. source: <20240223100112.44127-1-karthik.188@gmail.com> * jc/no-lazy-fetch (2024-02-27) 3 commits - - git: extend --no-lazy-fetch to work across subprocesses - - git: document GIT_NO_REPLACE_OBJECTS environment variable - (merged to 'next' on 2024-02-13 at 7c7136e547) + (merged to 'next' on 2024-03-01 at 14303cdbfe) + + git: extend --no-lazy-fetch to work across subprocesses + + git: document GIT_NO_REPLACE_OBJECTS environment variable + git: --no-lazy-fetch option + Originally merged to 'next' on 2024-02-29 + "git --no-lazy-fetch cmd" allows to run "cmd" while disabling lazy fetching of objects from the promisor remote, which may be handy for debugging. - Will merge to 'next'? + Will merge to 'master'. source: <xmqq1q8xx38i.fsf@gitster.g> source: <xmqq1q9cl3xv.fsf@gitster.g> source: <xmqq1q9mmtpw.fsf@gitster.g> @@ -683,13 +705,17 @@ Release tarballs are available at: source: <cover.1708728717.git.steadmon@google.com> -* cc/rev-list-allow-missing-tips (2024-02-14) 4 commits - (merged to 'next' on 2024-02-21 at 9b63eec23f) +* cc/rev-list-allow-missing-tips (2024-02-28) 5 commits + (merged to 'next' on 2024-03-01 at fd7b109d04) + + revision: fix --missing=[print|allow*] for annotated tags + (merged to 'next' on 2024-03-01 at ac0fc94378) + rev-list: allow missing tips with --missing=[print|allow*] + t6022: fix 'test' style and 'even though' typo + oidset: refactor oidset_insert_from_set() + revision: clarify a 'return NULL' in get_reference() + Originally merged to 'next' on 2024-02-28 + "git rev-list --missing=print" has learned to optionally take "--allow-missing-tips", which allows the objects at the starting points to be missing. @@ -699,46 +725,51 @@ Release tarballs are available at: * js/merge-tree-3-trees (2024-02-23) 7 commits - - fill_tree_descriptor(): mark error message for translation - - cache-tree: avoid an unnecessary check - - Always check `parse_tree*()`'s return value - - t4301: verify that merge-tree fails on missing blob objects - - merge-ort: do check `parse_tree()`'s return value - - merge-tree: fail with a non-zero exit code on missing tree objects - (merged to 'next' on 2024-01-30 at 0c77b04e59) + (merged to 'next' on 2024-03-01 at a75dc95f04) + + fill_tree_descriptor(): mark error message for translation + + cache-tree: avoid an unnecessary check + + Always check `parse_tree*()`'s return value + + t4301: verify that merge-tree fails on missing blob objects + + merge-ort: do check `parse_tree()`'s return value + + merge-tree: fail with a non-zero exit code on missing tree objects + merge-tree: accept 3 trees as arguments + Originally merged to 'next' on 2024-02-28 + "git merge-tree" has learned that the three trees involved in the 3-way merge only need to be trees, not necessarily commits. - Will merge to 'next'? + Will merge to 'master'. source: <pull.1647.git.1706277694231.gitgitgadget@gmail.com> source: <pull.1651.v4.git.1708677266.gitgitgadget@gmail.com> -* rj/complete-reflog (2024-01-26) 4 commits +* rj/complete-reflog (2024-03-03) 5 commits + - completion: reflog subcommands and options + - completion: factor out __git_resolve_builtins + - completion: introduce __git_find_subcommand - completion: reflog show <log-options> - completion: reflog with implicit "show" - - completion: introduce __git_find_subcommand - - completion: introduce __gitcomp_subcommand The command line completion script (in contrib/) learned to complete "git reflog" better. - Expecting a reroll. - cf. <dd106d87-3363-426a-90a2-16e1f2d04661@gmail.com> - source: <98daf977-dbad-4d3b-a293-6a769895088f@gmail.com> + Will merge to 'next'? + source: <ea6c8890-9ff3-46c9-b933-6a52083b1001@gmail.com> + +* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-02-28) 2 commits + (merged to 'next' on 2024-03-01 at 339111ec08) + + revision: implement `git log --merge` also for rebase/cherry-pick/revert + + revision: ensure MERGE_HEAD is a ref in prepare_show_merge -* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-02-27) 2 commits - - revision: implement `git log --merge` also for rebase/cherry-pick/revert - - revision: ensure MERGE_HEAD is a ref in prepare_show_merge + Originally merged to 'next' on 2024-02-29 "git log --merge" learned to pay attention to CHERRY_PICK_HEAD and other kinds of *_HEAD pseudorefs. - Will merge to 'next'? - source: <20240225-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v5-0-af1ef2d9e44d@gmail.com> + Will merge to 'master'. + source: <20240228-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v6-0-8ec34c052b39@gmail.com> * bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit @@ -765,22 +796,18 @@ Release tarballs are available at: source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com> -* la/trailer-api (2024-02-16) 9 commits - (merged to 'next' on 2024-02-21 at 631e28bbbc) - + format_trailers_from_commit(): indirectly call trailer_info_get() - + format_trailer_info(): move "fast path" to caller - + format_trailers(): use strbuf instead of FILE - + trailer_info_get(): reorder parameters - + trailer: start preparing for formatting unification - + trailer: move interpret_trailers() to interpret-trailers.c - + trailer: prepare to expose functions as part of API - + shortlog: add test for de-duplicating folded trailers - + trailer: free trailer_info _after_ all related usage +* la/trailer-api (2024-03-01) 9 commits + - format_trailers_from_commit(): indirectly call trailer_info_get() + - format_trailer_info(): move "fast path" to caller + - format_trailers(): use strbuf instead of FILE + - trailer_info_get(): reorder parameters + - trailer: move interpret_trailers() to interpret-trailers.c + - trailer: reorder format_trailers_from_commit() parameters + - trailer: rename functions to use 'trailer' + - shortlog: add test for de-duplicating folded trailers + - trailer: free trailer_info _after_ all related usage - Code clean-up. - - Will merge to 'master'. - source: <pull.1632.v5.git.1708124950.gitgitgadget@gmail.com> + source: <pull.1632.v6.git.1709252086.gitgitgadget@gmail.com> * tb/path-filter-fix (2024-01-31) 16 commits @@ -859,17 +886,3 @@ Release tarballs are available at: Not ready to be reviewed yet. source: <20230824205456.1231371-1-gitster@pobox.com> - --------------------------------------------------- -[Discarded] - -* mh/credential-oauth-refresh-token-with-osxkeychain (2024-02-14) 1 commit - . credential/osxkeychain: store new attributes - - OAuth refresh tokens and password expiry timestamps are now stored - in the osxkeychain backend , just the way libsecret and wincred - backends of the credential subsystem do. - - Retracted. - cf. <CAGJzqsknN_RmYeT0xcn4cTLcJhsxSOUC6ppRVepxMDf3day5Fw@mail.gmail.com> - source: <pull.1663.git.1707860618119.gitgitgadget@gmail.com> |