{"thread":{"id":"61073","subject":"What's cooking in git.git (Mar 2024, #02; Thu, 7)","startedAt":"2024-03-08T02:26:36Z","lastAt":"2024-03-09T11:34:44Z","messageCount":6,"participants":["Junio C Hamano","Christian Couder","Phillip Wood"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"490232","messageId":"xmqqplw5ihm7.fsf@gitster.g","threadId":"61073","inReplyTo":null,"subject":"What's cooking in git.git (Mar 2024, #02; Thu, 7)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-03-08T02:26:24Z","receivedAt":"2024-03-08T02:26:36Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking in my tree. Commits\nprefixed with '+' are in 'next' (being in 'next' is a sign that a\ntopic is stable enough to be used and are candidate to be in a\nfuture release). Commits prefixed with '-' are only in 'seen', and\naren't considered \"accepted\" at all and may be annotated with an URL\nto a message that raises issues but they are no means exhaustive. A\ntopic without enough support may be discarded after a long period of\nno activity (of course they can be resubmit when new interests\narise).\n\nThe 'maint' branch now points at the 2.44 maintenance track.\n\nCopies of the source code to Git live in many repositories, and the\nfollowing is a list of the ones I push into or their mirrors. Some\nrepositories have only a subset of branches.\n\nWith maint, master, next, seen, todo:\n\n\tgit://git.kernel.org/pub/scm/git/git.git/\n\tgit://repo.or.cz/alt-git.git/\n\thttps://kernel.googlesource.com/pub/scm/git/git/\n\thttps://github.com/git/git/\n\thttps://gitlab.com/git-vcs/git/\n\nWith all the integration branches and topics broken out:\n\n\thttps://github.com/gitster/git/\n\nEven though the preformatted documentation in HTML and man format\nare not sources, they are published in these repositories for\nconvenience (replace \"htmldocs\" with \"manpages\" for the manual\npages):\n\n\tgit://git.kernel.org/pub/scm/git/git-htmldocs.git/\n\thttps://github.com/gitster/git-htmldocs.git/\n\nRelease tarballs are available at:\n\n\thttps://www.kernel.org/pub/software/scm/git/\n\n--------------------------------------------------\n[Graduated to 'master']\n\n* ak/rebase-autosquash (2024-02-27) 1 commit\n (merged to 'next' on 2024-03-01 at 57a34830b7)\n + rebase: fix typo in autosquash documentation\n\n Originally merged to 'next' on 2024-02-27\n\n Typofix.\n source: \n\n\n* cc/rev-list-allow-missing-tips (2024-02-28) 5 commits\n (merged to 'next' on 2024-03-01 at fd7b109d04)\n + revision: fix --missing=[print|allow*] for annotated tags\n (merged to 'next' on 2024-03-01 at ac0fc94378)\n + rev-list: allow missing tips with --missing=[print|allow*]\n + t6022: fix 'test' style and 'even though' typo\n + oidset: refactor oidset_insert_from_set()\n + revision: clarify a 'return NULL' in get_reference()\n\n Originally merged to 'next' on 2024-02-28\n\n \"git rev-list --missing=print\" has learned to optionally take\n \"--allow-missing-tips\", which allows the objects at the starting\n points to be missing.\n source: <20240214142513.4002639-1-christian.couder@gmail.com>\n\n\n* eg/add-uflags (2024-02-29) 1 commit\n (merged to 'next' on 2024-03-01 at 5dbc997561)\n + add: use unsigned type for collection of bits\n\n Originally merged to 'next' on 2024-02-29\n\n Code clean-up practice.\n source: <20240229194444.8499-2-giganteeugenio2@gmail.com>\n\n\n* jc/doc-compat-util (2024-02-27) 1 commit\n (merged to 'next' on 2024-03-01 at 89b76c65d7)\n + doc: clarify the wording on requirement\n\n Originally merged to 'next' on 2024-02-27\n\n Clarify wording in the CodingGuidelines that requires \n to be the first header file.\n source: \n\n\n* jc/no-include-of-compat-util-from-headers (2024-02-24) 1 commit\n (merged to 'next' on 2024-03-01 at ebb921087e)\n + compat: drop inclusion of \n\n Originally merged to 'next' on 2024-02-26\n\n Header file clean-up.\n source: \n\n\n* jc/no-lazy-fetch (2024-02-27) 3 commits\n (merged to 'next' on 2024-03-01 at 14303cdbfe)\n + git: extend --no-lazy-fetch to work across subprocesses\n + git: document GIT_NO_REPLACE_OBJECTS environment variable\n + git: --no-lazy-fetch option\n\n Originally merged to 'next' on 2024-02-29\n\n \"git --no-lazy-fetch cmd\" allows to run \"cmd\" while disabling lazy\n fetching of objects from the promisor remote, which may be handy\n for debugging.\n source: \n source: \n source: \n\n\n* jk/reflog-special-cases-fix (2024-02-26) 3 commits\n (merged to 'next' on 2024-03-01 at 2b67f6e668)\n + read_ref_at(): special-case ref@{0} for an empty reflog\n + get_oid_basic(): special-case ref@{n} for oldest reflog entry\n + Revert \"refs: allow @{n} to work with n-sized reflog\"\n\n Originally merged to 'next' on 2024-02-27\n\n The logic to access reflog entries by date and number had ugly\n corner cases at the boundaries, which have been cleaned up.\n source: <20240226100010.GA1214708@coredump.intra.peff.net>\n\n\n* jk/textconv-cache-outside-repo-fix (2024-02-26) 1 commit\n (merged to 'next' on 2024-03-01 at 8508b83758)\n + userdiff: skip textconv caching when not in a repository\n\n Originally merged to 'next' on 2024-02-26\n\n The code incorrectly attempted to use textconv cache when asked,\n even when we are not running in a repository, which has been\n corrected.\n source: <20240226102729.GB2685773@coredump.intra.peff.net>\n\n\n* jk/upload-pack-bounded-resources (2024-02-28) 9 commits\n (merged to 'next' on 2024-03-01 at b70b6f0913)\n + upload-pack: free tree buffers after parsing\n + upload-pack: use PARSE_OBJECT_SKIP_HASH_CHECK in more places\n + upload-pack: always turn off save_commit_buffer\n + upload-pack: disallow object-info capability by default\n + upload-pack: accept only a single packfile-uri line\n + upload-pack: use a strmap for want-ref lines\n + upload-pack: use oidset for deepen_not list\n + upload-pack: switch deepen-not list to an oid_array\n + upload-pack: drop separate v2 \"haves\" array\n\n Originally merged to 'next' on 2024-02-29\n\n Various parts of upload-pack has been updated to bound the resource\n consumption relative to the size of the repository to protect from\n abusive clients.\n source: <20240228223700.GA1157826@coredump.intra.peff.net>\n\n\n* jk/upload-pack-v2-capability-cleanup (2024-02-29) 4 commits\n (merged to 'next' on 2024-03-01 at 2750893db7)\n + upload-pack: only accept packfile-uris if we advertised it\n + upload-pack: use existing config mechanism for advertisement\n + upload-pack: centralize setup of sideband-all config\n + upload-pack: use repository struct to get config\n\n Originally merged to 'next' on 2024-02-29\n\n The upload-pack program, when talking over v2, accepted the\n packfile-uris protocol extension from the client, even if it did\n not advertise the capability, which has been corrected.\n source: <20240228224625.GA1158651@coredump.intra.peff.net>\n\n\n* js/merge-tree-3-trees (2024-02-23) 7 commits\n (merged to 'next' on 2024-03-01 at a75dc95f04)\n + fill_tree_descriptor(): mark error message for translation\n + cache-tree: avoid an unnecessary check\n + Always check `parse_tree*()`'s return value\n + t4301: verify that merge-tree fails on missing blob objects\n + merge-ort: do check `parse_tree()`'s return value\n + merge-tree: fail with a non-zero exit code on missing tree objects\n + merge-tree: accept 3 trees as arguments\n\n Originally merged to 'next' on 2024-02-28\n\n \"git merge-tree\" has learned that the three trees involved in the\n 3-way merge only need to be trees, not necessarily commits.\n source: \n source: \n\n\n* js/remove-cruft-files (2024-02-26) 1 commit\n (merged to 'next' on 2024-03-01 at 63100a274b)\n + neue: remove a bogus empty file\n\n Originally merged to 'next' on 2024-02-26\n\n Remove an empty file that shouldn't have been added in the first\n place.\n source: \n\n\n* jt/commit-redundant-scissors-fix (2024-02-27) 2 commits\n (merged to 'next' on 2024-03-01 at e5983498f1)\n + commit: unify logic to avoid multiple scissors lines when merging\n + commit: avoid redundant scissor line with --cleanup=scissors -v\n\n Originally merged to 'next' on 2024-02-29\n\n \"git commit -v --cleanup=scissors\" used to add the scissors line\n twice in the log message buffer, which has been corrected.\n source: \n\n\n* kn/for-all-refs (2024-02-23) 6 commits\n (merged to 'next' on 2024-03-01 at 76a1297ace)\n + for-each-ref: add new option to include root refs\n + ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR'\n + refs: introduce `refs_for_each_include_root_refs()`\n + refs: extract out `loose_fill_ref_dir_regular_file()`\n + refs: introduce `is_pseudoref()` and `is_headref()`\n + Merge branch 'ps/reftable-backend' into kn/for-all-refs\n\n Originally merged to 'next' on 2024-02-27\n\n \"git for-each-ref\" learned \"--include-root-refs\" option to show\n even the stuff outside the 'refs/' hierarchy.\n source: <20240223100112.44127-1-karthik.188@gmail.com>\n\n\n* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-02-28) 2 commits\n (merged to 'next' on 2024-03-01 at 339111ec08)\n + revision: implement `git log --merge` also for rebase/cherry-pick/revert\n + revision: ensure MERGE_HEAD is a ref in prepare_show_merge\n\n Originally merged to 'next' on 2024-02-29\n\n \"git log --merge\" learned to pay attention to CHERRY_PICK_HEAD and\n other kinds of *_HEAD pseudorefs.\n source: <20240228-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v6-0-8ec34c052b39@gmail.com>\n\n\n* pb/ort-make-submodule-conflict-message-an-advice (2024-02-26) 1 commit\n (merged to 'next' on 2024-03-01 at df880cde2e)\n + merge-ort: turn submodule conflict suggestions into an advice\n\n Originally merged to 'next' on 2024-02-27\n\n When a merge conflicted at a submodule, merge-ort backend used to\n unconditionally give a lengthy message to suggest how to resolve\n it. Now the message can be squelched as an advice message.\n source: \n\n\n* ps/reftable-repo-init-fix (2024-02-27) 2 commits\n (merged to 'next' on 2024-03-01 at abbf85051b)\n + refs/reftable: don't fail empty transactions in repo without HEAD\n + Merge branch 'ps/remote-helper-repo-initialization-fix' into ps/reftable-repo-init-fix\n (this branch uses ps/remote-helper-repo-initialization-fix.)\n\n Originally merged to 'next' on 2024-02-29\n\n Clear the fallout from a fix for 2.44 regression.\n source: <95be968e10bd02c64448786e690bbefe5c082577.1709041721.git.ps@pks.im>\n\n\n* ps/remote-helper-repo-initialization-fix (2024-02-27) 1 commit\n (merged to 'next' on 2024-03-01 at 7b79ffbd8f)\n + builtin/clone: allow remote helpers to detect repo\n (this branch is used by ps/reftable-repo-init-fix.)\n\n Originally merged to 'next' on 2024-02-29\n\n A custom remote helper no longer cannot access the newly created\n repository during \"git clone\", which is a regression in Git 2.44.\n This has been corrected.\n source: <9d888adf92e9a8af7c18847219f97d3e595e3e36.1709041721.git.ps@pks.im>\n\n\n* rs/fetch-simplify-with-starts-with (2024-02-26) 1 commit\n (merged to 'next' on 2024-03-01 at 000e015fff)\n + fetch: convert strncmp() with strlen() to starts_with()\n\n Originally merged to 'next' on 2024-02-27\n\n Code simplification.\n source: \n\n\n* rs/name-rev-with-mempool (2024-02-26) 2 commits\n (merged to 'next' on 2024-03-01 at d53eac1836)\n + name-rev: use mem_pool_strfmt()\n + mem-pool: add mem_pool_strfmt()\n\n Originally merged to 'next' on 2024-02-27\n\n Many small allocations \"git name-rev\" makes have been updated to\n allocate from a mem-pool.\n source: <20240225113947.89357-1-l.s.r@web.de>\n\n\n* rs/submodule-prefix-simplify (2024-02-26) 1 commit\n (merged to 'next' on 2024-03-01 at 05d4d90201)\n + submodule: use strvec_pushf() for --submodule-prefix\n\n Originally merged to 'next' on 2024-02-27\n\n Code simplification.\n source: <8cd983fb-32b9-41c6-a9e7-a485b190488c@web.de>\n\n\n* sg/upload-pack-error-message-fix (2024-02-26) 1 commit\n (merged to 'next' on 2024-03-01 at b94664a7a0)\n + upload-pack: don't send null character in abort message to the client\n\n Originally merged to 'next' on 2024-02-27\n\n An error message from \"git upload-pack\", which responds to \"git\n fetch\" requests, had a trialing NUL in it, which has been\n corrected.\n source: <20240225183452.1939334-1-szeder.dev@gmail.com>\n\n--------------------------------------------------\n[New Topics]\n\n* ag/t0010-modernize (2024-03-05) 1 commit\n (merged to 'next' on 2024-03-07 at 38339abc2d)\n + tests: modernize the test script t0010-racy-git.sh\n\n GSoC practice to modernize a test script.\n\n Will merge to 'master'.\n source: \n\n\n* fs/find-end-of-log-message-fix (2024-03-07) 1 commit\n - wt-status: don't find scissors line beyond buf len\n\n The code to find the effective end of log message can fall into an\n endless loop, which has been corrected.\n\n Waiting for review response.\n source: <20240307183743.219951-1-flosch@nutanix.com>\n\n\n* hd/config-mak-os390 (2024-03-06) 1 commit\n (merged to 'next' on 2024-03-07 at 289d3ab691)\n + build: support z/OS (OS/390).\n\n Platform specific tweaks for OS/390 has been added to\n config.mak.uname.\n\n Will merge to 'master'.\n source: \n\n\n* jk/core-comment-string (2024-03-07) 15 commits\n - config: allow multi-byte core.commentChar\n - environment: drop comment_line_char compatibility macro\n - wt-status: drop custom comment-char stringification\n - sequencer: handle multi-byte comment characters when writing todo list\n - find multi-byte comment chars in unterminated buffers\n - find multi-byte comment chars in NUL-terminated strings\n - prefer comment_line_str to comment_line_char for printing\n - strbuf: accept a comment string for strbuf_add_commented_lines()\n - strbuf: accept a comment string for strbuf_commented_addf()\n - strbuf: accept a comment string for strbuf_stripspace()\n - environment: store comment_line_char as a string\n - strbuf: avoid shadowing global comment_line_char name\n - commit: refactor base-case of adjust_comment_line_char()\n - strbuf: avoid static variables in strbuf_add_commented_lines()\n - strbuf: simplify comment-handling in add_lines() helper\n\n core.commentChar used to be limited to a single byte, but has been\n updated to allow an arbitrary multi-byte sequence.\n\n Will merge to 'next'?\n source: <20240307091407.GA2072522@coredump.intra.peff.net>\n\n\n* jk/doc-remote-helpers-markup-fix (2024-03-07) 1 commit\n - doc/gitremote-helpers: fix missing single-quote\n\n Doc mark-up fix.\n\n Will merge to 'next'.\n source: <20240307084313.GA2072022@coredump.intra.peff.net>\n\n\n* js/build-fuzz-more-often (2024-03-05) 3 commits\n - SQUASH???\n - fuzz: link fuzz programs with `make all` on Linux\n - ci: also define CXX environment variable\n\n In addition to building the objects needed, try to link the objects\n that are used in fuzzer tests, to make sure at least they build\n without bitrot, in Linux CI runs.\n\n Comments?\n source: \n\n\n* kh/branch-ref-syntax-advice (2024-03-05) 5 commits\n (merged to 'next' on 2024-03-07 at 914f01967b)\n + branch: advise about ref syntax rules\n + advice: use double quotes for regular quoting\n + advice: use backticks for verbatim\n + advice: make all entries stylistically consistent\n + t3200: improve test style\n\n When git refuses to create a branch because the proposed branch\n name is not a valid refname, an advice message is given to refer\n the user to exact naming rules.\n\n Will merge to 'master'.\n source: \n\n\n* kh/doc-commentchar-is-a-byte (2024-03-05) 1 commit\n (merged to 'next' on 2024-03-06 at 5941655c04)\n + config: document `core.commentChar` as ASCII-only\n\n The \"core.commentChar\" configuration variable only allows an ASCII\n character, which was not clearly documented, which has been\n corrected.\n\n Will merge to 'master'.\n source: <9633f9be5ddd9ab3df4b79ee934e1ed47e90bd1d.1709656683.git.code@khaugsbakk.name>\n\n\n* ps/reftable-block-search-fix (2024-03-07) 2 commits\n - reftable/block: fix binary search over restart counter\n - reftable/record: fix memory leak when decoding object records\n\n The reftable code has its own custom binary search function whose\n comparison callback has an unusual interface, which caused the\n binary search to degenerate into a linear search, which has been\n corrected.\n\n Will merge to 'next'?\n source: \n\n\n* ps/reftable-reflog-iteration-perf (2024-03-05) 8 commits\n - refs/reftable: track last log record name via strbuf\n - reftable/record: use scratch buffer when decoding records\n - reftable/record: reuse message when decoding log records\n - reftable/record: reuse refnames when decoding log records\n - reftable/record: avoid copying author info\n - reftable/record: convert old and new object IDs to arrays\n - refs/reftable: reload correct stack when creating reflog iter\n - Merge branch 'ps/reftable-iteration-perf-part2' into ps/reftable-reflog-iteration-perf\n (this branch uses ps/reftable-iteration-perf-part2.)\n\n The code to iterate over reflogs in the reftable has been optimized\n to reduce memory allocation and deallocation.\n\n Needs review.\n source: \n\n\n* sj/userdiff-c-sharp (2024-03-06) 1 commit\n - userdiff: better method/property matching for C#\n\n The userdiff patterns for C# has been updated.\n\n Needs review.\n source: \n\n--------------------------------------------------\n[Cooking]\n\n* es/config-doc-sort-sections (2024-02-29) 1 commit\n (merged to 'next' on 2024-03-04 at 0752144ed7)\n + docs: sort configuration variable groupings alphabetically\n\n Doc updates.\n\n Will merge to 'master'.\n source: <20240229190229.20222-1-ericsunshine@charter.net>\n\n\n* kh/doc-dashed-commands-have-not-worked-for-a-long-time (2024-03-01) 1 commit\n (merged to 'next' on 2024-03-04 at 7e070c67f9)\n + gitcli: drop mention of “non-dashed form”\n\n Doc update.\n\n Will merge to 'master'.\n source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@khaugsbakk.name>\n\n\n* jc/xwrite-cleanup (2024-03-02) 3 commits\n (merged to 'next' on 2024-03-07 at 43e66f7e4d)\n + repack: check error writing to pack-objects subprocess\n + sideband: avoid short write(2)\n + unpack: replace xwrite() loop with write_in_full()\n\n Uses of xwrite() helper have been audited and updated for better\n error checking and simpler code.\n\n Will merge to 'master'.\n source: <20240302190348.3946569-1-gitster@pobox.com>\n\n\n* jc/test-i18ngrep (2024-03-02) 1 commit\n (merged to 'next' on 2024-03-06 at 2c57ebc706)\n + test_i18ngrep: hard deprecate and forbid its use\n\n With release 2.44 we got rid of all uses of test_i18ngrep and there\n is no in-flight topic that adds a new use of it. Make a call to\n test_i18ngrep a hard failure, so that we can remove it at the end\n of this release cycle.\n\n Will merge to 'master'.\n source: \n\n\n* gt/core-bare-in-templates (2024-03-04) 1 commit\n (merged to 'next' on 2024-03-06 at e54ac5acf9)\n + setup: remove unnecessary variable\n\n Code simplification.\n\n Will merge to 'master'.\n source: <20240304151811.511780-1-shyamthakkar001@gmail.com>\n\n\n* so/clean-dry-run-without-force (2024-03-04) 2 commits\n (merged to 'next' on 2024-03-06 at ccf2e123be)\n + clean: further clean-up of implementation around \"--force\"\n + clean: improve -n and -f implementation and documentation\n\n The implementation in \"git clean\" that makes \"-n\" and \"-i\" ignore\n clean.requireForce has been simplified, together with the\n documentation.\n\n Will merge to 'master'.\n source: <87le6ziqzb.fsf_-_@osv.gnss.ru>\n source: <20240303220600.2491792-1-gitster@pobox.com>\n\n\n* jh/trace2-missing-def-param-fix (2024-03-07) 3 commits\n - trace2: emit 'def_param' set with 'cmd_name' event\n - trace2: avoid emitting 'def_param' set more than once\n - t0211: demonstrate missing 'def_param' events for certain commands\n\n Some trace2 events that lacked def_param have learned to show it,\n enriching the output.\n\n Reviewed-by: Josh Steadmon \n cf. \n\n Will merge to 'next'.\n source: \n\n\n* ps/reftable-stack-tempfile (2024-03-07) 4 commits\n - reftable/stack: register compacted tables as tempfiles\n - reftable/stack: register lockfiles during compaction\n - reftable/stack: register new tables as tempfiles\n - lockfile: report when rollback fails\n\n The code in reftable backend that creates new table files works\n better with the tempfile framework to avoid leaving cruft after a\n failure.\n\n Will merge to 'next'?\n source: \n\n\n* rs/opt-parse-long-fixups (2024-03-03) 6 commits\n - parse-options: rearrange long_name matching code\n - parse-options: normalize arg and long_name before comparison\n - parse-options: detect ambiguous self-negation\n - parse-options: factor out register_abbrev() and struct parsed_option\n - parse-options: set arg of abbreviated option lazily\n - parse-options: recognize abbreviated negated option with arg\n\n The parse-options code that deals with abbreviated long option\n names have been cleaned up.\n\n Needs review.\n source: <20240303121944.20627-1-l.s.r@web.de>\n\n\n* sj/t9117-path-is-file (2024-03-04) 1 commit\n (merged to 'next' on 2024-03-04 at de5f6a74cb)\n + t9117: prefer test_path_* helper functions\n\n GSoC practice to replace \"test -f\" with \"test_path_is_file\".\n\n Will merge to 'master'.\n source: <20240304095436.56399-2-shejialuo@gmail.com>\n\n\n* vm/t7301-use-test-path-helpers (2024-03-06) 1 commit\n (merged to 'next' on 2024-03-07 at e638654635)\n + t7301: use test_path_is_(missing|file)\n\n GSoC practice to replace \"test -f\" with \"test_path_is_file\".\n\n Will merge to 'master'.\n source: <20240304171732.64457-2-vincenzo.mezzela@gmail.com>\n\n\n* cw/git-std-lib (2024-02-28) 4 commits\n . SQUASH??? get rid of apparent debugging crufts\n . test-stdlib: show that git-std-lib is independent\n . git-std-lib: introduce Git Standard Library\n . pager: include stdint.h because uintmax_t is used\n\n Split libgit.a out to a separate git-std-lib tor easier reuse.\n\n Expecting a reroll.\n source: \n\n\n* js/merge-base-with-missing-commit (2024-02-29) 11 commits\n (merged to 'next' on 2024-03-01 at 3e3eabaee9)\n + commit-reach(repo_get_merge_bases_many_dirty): pass on errors\n + commit-reach(repo_get_merge_bases_many): pass on \"missing commits\" errors\n + commit-reach(get_octopus_merge_bases): pass on \"missing commits\" errors\n + commit-reach(repo_get_merge_bases): pass on \"missing commits\" errors\n + commit-reach(get_merge_bases_many_0): pass on \"missing commits\" errors\n + commit-reach(merge_bases_many): pass on \"missing commits\" errors\n + commit-reach(paint_down_to_common): start reporting errors\n + commit-reach(paint_down_to_common): prepare for handling shallow commits\n + commit-reach(repo_in_merge_bases_many): report missing commits\n + commit-reach(repo_in_merge_bases_many): optionally expect missing commits\n + commit-reach(paint_down_to_common): plug two memory leaks\n\n Originally merged to 'next' on 2024-02-29\n\n Make sure failure return from merge_bases_many() is properly caught.\n\n Needs an incremental fix-up.\n cf.<20240301065805.GB2680308@coredump.intra.peff.net>\n source: \n\n\n* rj/complete-worktree-paths-fix (2024-02-27) 1 commit\n (merged to 'next' on 2024-03-06 at b6ba949383)\n + completion: fix __git_complete_worktree_paths\n\n The logic to complete the command line arguments to \"git worktree\"\n subcommand (in contrib/) has been updated to correctly honor things\n like \"git -C dir\" etc.\n\n Will merge to 'master'.\n source: \n\n\n* rs/t-ctype-simplify (2024-03-03) 4 commits\n (merged to 'next' on 2024-03-04 at 9bd84a8877)\n + t-ctype: avoid duplicating class names\n + t-ctype: align output of i\n + t-ctype: simplify EOF check\n + t-ctype: allow NUL anywhere in the specification string\n\n Code simplification to one unit-test program.\n\n Will merge to 'master'.\n source: <20240303101330.20187-1-l.s.r@web.de>\n\n\n* pw/rebase-i-ignore-cherry-pick-help-environment (2024-02-27) 1 commit\n - rebase -i: stop setting GIT_CHERRY_PICK_HELP\n\n Code simplification by getting rid of code that sets an environment\n variable that is no longer used.\n\n Will merge to 'next'.\n source: \n\n\n* as/option-names-in-messages (2024-03-05) 4 commits\n (merged to 'next' on 2024-03-07 at 73ab51faba)\n + revision.c: trivial fix to message\n + builtin/clone.c: trivial fix of message\n + builtin/remote.c: trivial fix of error message\n + transport-helper.c: trivial fix of error message\n\n Error message updates.\n\n Will merge to 'master'.\n source: <20240216101647.28837-1-ash@kambanaria.org>\n\n\n* jh/fsmonitor-icase-corner-case-fix (2024-03-06) 14 commits\n (merged to 'next' on 2024-03-06 at 356eafea7e)\n + fsmonitor: support case-insensitive events\n + fsmonitor: refactor bit invalidation in refresh callback\n + fsmonitor: trace the new invalidated cache-entry count\n + fsmonitor: return invalidated cache-entry count on non-directory event\n + fsmonitor: remove custom loop from non-directory path handler\n + fsmonitor: return invalidated cache-entry count on directory event\n + fsmonitor: move untracked-cache invalidation into helper functions\n + fsmonitor: refactor untracked-cache invalidation\n + dir: create untracked_cache_invalidate_trimmed_path()\n + fsmonitor: refactor refresh callback for non-directory events\n + fsmonitor: clarify handling of directory events in callback helper\n + fsmonitor: refactor refresh callback on directory events\n + t7527: add case-insensitve test for FSMonitor\n + name-hash: add index_dir_find()\n\n FSMonitor client code was confused when FSEvents were given in a\n different case on a case-insensitive filesystem, which has been\n corrected.\n\n Acked-by: Patrick Steinhardt \n cf. \n\n Will merge to 'master'.\n source: \n\n\n* ps/reftable-iteration-perf-part2 (2024-03-04) 13 commits\n (merged to 'next' on 2024-03-06 at e8ba314585)\n + refs/reftable: precompute prefix length\n + reftable: allow inlining of a few functions\n + reftable/record: decode keys in place\n + reftable/record: reuse refname when copying\n + reftable/record: reuse refname when decoding\n + reftable/merged: avoid duplicate pqueue emptiness check\n + reftable/merged: circumvent pqueue with single subiter\n + reftable/merged: handle subiter cleanup on close only\n + reftable/merged: remove unnecessary null check for subiters\n + reftable/merged: make subiters own their records\n + reftable/merged: advance subiter on subsequent iteration\n + reftable/merged: make `merged_iter` structure private\n + reftable/pq: use `size_t` to track iterator index\n (this branch is used by ps/reftable-reflog-iteration-perf.)\n\n The code to iterate over refs with the reftable backend has seen\n some optimization.\n\n Will merge to 'master'.\n source: \n\n\n* js/cmake-with-test-tool (2024-02-23) 2 commits\n - cmake: let `test-tool` run the unit tests, too\n - Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool\n (this branch uses js/unit-test-suite-runner.)\n\n \"test-tool\" is now built in CMake build to also run the unit tests.\n\n May want to roll it into the base topic.\n source: \n\n\n* js/unit-test-suite-runner (2024-02-23) 8 commits\n - ci: use test-tool as unit test runner on Windows\n - t/Makefile: run unit tests alongside shell tests\n - unit tests: add rule for running with test-tool\n - test-tool run-command testsuite: support unit tests\n - test-tool run-command testsuite: remove hardcoded filter\n - test-tool run-command testsuite: get shell from env\n - t0080: turn t-basic unit test into a helper\n - Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner\n (this branch is used by js/cmake-with-test-tool.)\n\n The \"test-tool\" has been taught to run testsuite tests in parallel,\n bypassing the need to use the \"prove\" tool.\n\n Needs review.\n source: \n\n\n* rj/complete-reflog (2024-03-03) 5 commits\n (merged to 'next' on 2024-03-06 at 0f1a25debc)\n + completion: reflog subcommands and options\n + completion: factor out __git_resolve_builtins\n + completion: introduce __git_find_subcommand\n + completion: reflog show \n + completion: reflog with implicit \"show\"\n\n The command line completion script (in contrib/) learned to\n complete \"git reflog\" better.\n\n Will merge to 'master'.\n source: \n\n\n* bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit\n - completion: dir-type optargs for am, format-patch\n\n Command line completion support (in contrib/) has been\n updated for a few commands to complete directory names where a\n directory name is expected.\n\n Expecting a reroll.\n cf. <40c3a824-a961-490b-94d4-4eb23c8f713d@gmail.com>\n cf. <6683f24e-7e56-489d-be2d-8afe1fc38d2b@gmail.com>\n source: \n\n\n* bk/complete-send-email (2024-01-12) 1 commit\n - completion: don't complete revs when --no-format-patch\n\n Command line completion support (in contrib/) has been taught to\n avoid offering revision names as candidates to \"git send-email\" when\n the command is used to send pre-generated files.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* la/trailer-api (2024-03-01) 9 commits\n (merged to 'next' on 2024-03-06 at f119923ff6)\n + format_trailers_from_commit(): indirectly call trailer_info_get()\n + format_trailer_info(): move \"fast path\" to caller\n + format_trailers(): use strbuf instead of FILE\n + trailer_info_get(): reorder parameters\n + trailer: move interpret_trailers() to interpret-trailers.c\n + trailer: reorder format_trailers_from_commit() parameters\n + trailer: rename functions to use 'trailer'\n + shortlog: add test for de-duplicating folded trailers\n + trailer: free trailer_info _after_ all related usage\n\n Trailer API updates.\n\n Acked-by: Christian Couder \n cf. \n\n Will merge to 'master'.\n source: \n\n\n* tb/path-filter-fix (2024-01-31) 16 commits\n - bloom: introduce `deinit_bloom_filters()`\n - commit-graph: reuse existing Bloom filters where possible\n - object.h: fix mis-aligned flag bits table\n - commit-graph: new Bloom filter version that fixes murmur3\n - commit-graph: unconditionally load Bloom filters\n - bloom: prepare to discard incompatible Bloom filters\n - bloom: annotate filters with hash version\n - repo-settings: introduce commitgraph.changedPathsVersion\n - t4216: test changed path filters with high bit paths\n - t/helper/test-read-graph: implement `bloom-filters` mode\n - bloom.h: make `load_bloom_filter_from_graph()` public\n - t/helper/test-read-graph.c: extract `dump_graph_info()`\n - gitformat-commit-graph: describe version 2 of BDAT\n - commit-graph: ensure Bloom filters are read with consistent settings\n - revision.c: consult Bloom filters for root commits\n - t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()`\n\n The Bloom filter used for path limited history traversal was broken\n on systems whose \"char\" is unsigned; update the implementation and\n bump the format version to 2.\n\n Waiting for a final ack?\n cf. \n source: \n\n\n* eb/hash-transition (2023-10-02) 30 commits\n - t1016-compatObjectFormat: add tests to verify the conversion between objects\n - t1006: test oid compatibility with cat-file\n - t1006: rename sha1 to oid\n - test-lib: compute the compatibility hash so tests may use it\n - builtin/ls-tree: let the oid determine the output algorithm\n - object-file: handle compat objects in check_object_signature\n - tree-walk: init_tree_desc take an oid to get the hash algorithm\n - builtin/cat-file: let the oid determine the output algorithm\n - rev-parse: add an --output-object-format parameter\n - repository: implement extensions.compatObjectFormat\n - object-file: update object_info_extended to reencode objects\n - object-file-convert: convert commits that embed signed tags\n - object-file-convert: convert commit objects when writing\n - object-file-convert: don't leak when converting tag objects\n - object-file-convert: convert tag objects when writing\n - object-file-convert: add a function to convert trees between algorithms\n - object: factor out parse_mode out of fast-import and tree-walk into in object.h\n - cache: add a function to read an OID of a specific algorithm\n - tag: sign both hashes\n - commit: export add_header_signature to support handling signatures on tags\n - commit: convert mergetag before computing the signature of a commit\n - commit: write commits for both hashes\n - object-file: add a compat_oid_in parameter to write_object_file_flags\n - object-file: update the loose object map when writing loose objects\n - loose: compatibilty short name support\n - loose: add a mapping between SHA-1 and SHA-256 for loose objects\n - repository: add a compatibility hash algorithm\n - object-names: support input of oids in any supported hash\n - oid-array: teach oid-array to handle multiple kinds of oids\n - object-file-convert: stubs for converting from one object format to another\n\n Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.\n\n Will merge to and cook in 'next'.\n cf. \n source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>\n\n\n* jc/rerere-cleanup (2023-08-25) 4 commits\n - rerere: modernize use of empty strbuf\n - rerere: try_merge() should use LL_MERGE_ERROR when it means an error\n - rerere: fix comment on handle_file() helper\n - rerere: simplify check_one_conflict() helper function\n\n Code clean-up.\n\n Not ready to be reviewed yet.\n source: <20230824205456.1231371-1-gitster@pobox.com>\n"},{"id":"490239","messageId":"CAP8UFD1oWrE-C0XYi47PrBF36bJzHAv-jOq3r1UXw_BVnb97pA@mail.gmail.com","threadId":"61073","inReplyTo":"xmqqplw5ihm7.fsf@gitster.g","subject":"Re: What's cooking in git.git (Mar 2024, #02; Thu, 7)","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2024-03-08T10:31:41Z","receivedAt":"2024-03-08T10:31:54Z","isPatch":false,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"(Sorry for sending this first privately to Junio by mistake.)\n\nOn Fri, Mar 8, 2024 at 3:27 AM Junio C Hamano wrote:\n\n> * cc/rev-list-allow-missing-tips (2024-02-28) 5 commits\n> (merged to 'next' on 2024-03-01 at fd7b109d04)\n> + revision: fix --missing=[print|allow*] for annotated tags\n> (merged to 'next' on 2024-03-01 at ac0fc94378)\n> + rev-list: allow missing tips with --missing=[print|allow*]\n> + t6022: fix 'test' style and 'even though' typo\n> + oidset: refactor oidset_insert_from_set()\n> + revision: clarify a 'return NULL' in get_reference()\n>\n> Originally merged to 'next' on 2024-02-28\n>\n> \"git rev-list --missing=print\" has learned to optionally take\n> \"--allow-missing-tips\", which allows the objects at the starting\n> points to be missing.\n\nThe description might want to be updated as no new\n\"--allow-missing-tips\" option is introduced anymore. Maybe something\nlike this instead:\n\n\"git rev-list --missing=[print|allow*]\" has learned to not die when\nsome tips passed to it as command line arguments are missing. Instead\nthose tips are just reported among the missing objects and ignored for\ntraversal.\n\n> source: <20240214142513.4002639-1-christian.couder@gmail.com>\n"},{"id":"490241","messageId":"f7cd227f-dcde-4d71-b1a6-a4d34c492cd1@gmail.com","threadId":"61073","inReplyTo":"xmqqplw5ihm7.fsf@gitster.g","subject":"Re: What's cooking in git.git (Mar 2024, #02; Thu, 7)","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2024-03-08T13:56:35Z","receivedAt":"2024-03-08T13:56:38Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 08/03/2024 02:26, Junio C Hamano wrote:\n> * rs/t-ctype-simplify (2024-03-03) 4 commits\n> (merged to 'next' on 2024-03-04 at 9bd84a8877)\n> + t-ctype: avoid duplicating class names\n> + t-ctype: align output of i\n> + t-ctype: simplify EOF check\n> + t-ctype: allow NUL anywhere in the specification string\n> \n> Code simplification to one unit-test program.\n> \n> Will merge to 'master'.\n> source: <20240303101330.20187-1-l.s.r@web.de>\n\nI have some concerns about the last patch of this series c.f. \n<0947cb09-8b07-4fcd-bbe2-ae37c2cd5ec7@gmail.com> It might be too late \nfor this series but using the internal implementation functions rather \nthan TEST() is not a pattern that I would want us to encourage.\n\nBest Wishes\n\nPhillip\n\n"},{"id":"490251","messageId":"xmqqy1ashh03.fsf@gitster.g","threadId":"61073","inReplyTo":"CAP8UFD1oWrE-C0XYi47PrBF36bJzHAv-jOq3r1UXw_BVnb97pA@mail.gmail.com","subject":"Re: What's cooking in git.git (Mar 2024, #02; Thu, 7)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-03-08T15:37:16Z","receivedAt":"2024-03-08T15:37:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Couder writes:\n\n> (Sorry for sending this first privately to Junio by mistake.)\n>\n> On Fri, Mar 8, 2024 at 3:27 AM Junio C Hamano wrote:\n>\n>> * cc/rev-list-allow-missing-tips (2024-02-28) 5 commits\n>> (merged to 'next' on 2024-03-01 at fd7b109d04)\n>> + revision: fix --missing=[print|allow*] for annotated tags\n>> (merged to 'next' on 2024-03-01 at ac0fc94378)\n>> + rev-list: allow missing tips with --missing=[print|allow*]\n>> + t6022: fix 'test' style and 'even though' typo\n>> + oidset: refactor oidset_insert_from_set()\n>> + revision: clarify a 'return NULL' in get_reference()\n>>\n>> Originally merged to 'next' on 2024-02-28\n>>\n>> \"git rev-list --missing=print\" has learned to optionally take\n>> \"--allow-missing-tips\", which allows the objects at the starting\n>> points to be missing.\n>\n> The description might want to be updated as no new\n> \"--allow-missing-tips\" option is introduced anymore. Maybe something\n> like this instead:\n>\n> \"git rev-list --missing=[print|allow*]\" has learned to not die when\n> some tips passed to it as command line arguments are missing. Instead\n> those tips are just reported among the missing objects and ignored for\n> traversal.\n\nThanks for a comment; better late than never. We'd probably need to\nupdate the release notes, as this is gone from the list of cooking\ntopics already.\n"},{"id":"490252","messageId":"xmqqttlghgqs.fsf@gitster.g","threadId":"61073","inReplyTo":"f7cd227f-dcde-4d71-b1a6-a4d34c492cd1@gmail.com","subject":"Re: What's cooking in git.git (Mar 2024, #02; Thu, 7)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-03-08T15:42:51Z","receivedAt":"2024-03-08T15:42:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood writes:\n\n> On 08/03/2024 02:26, Junio C Hamano wrote:\n>> * rs/t-ctype-simplify (2024-03-03) 4 commits\n>> (merged to 'next' on 2024-03-04 at 9bd84a8877)\n>> + t-ctype: avoid duplicating class names\n>> + t-ctype: align output of i\n>> + t-ctype: simplify EOF check\n>> + t-ctype: allow NUL anywhere in the specification string\n>> Code simplification to one unit-test program.\n>> Will merge to 'master'.\n>> source: <20240303101330.20187-1-l.s.r@web.de>\n>\n> I have some concerns about the last patch of this series\n> c.f. <0947cb09-8b07-4fcd-bbe2-ae37c2cd5ec7@gmail.com> It might be too\n> late for this series but using the internal implementation functions\n> rather than TEST() is not a pattern that I would want us to encourage.\n\nI actually think it is merely showing the lack of necessary features\nin TEST() and other public macros/functions of the relatively new\nlow level test framework. If a user of the framework needs to use\nthe \"internal implementation functions\", that gives an incentive to\nthose who are pushing for the test framework to polish and update it,\nso that such a framework client does not have to go deep into the\nimplementation details. When they come up with an improved framework,\nthey naturally have the first target to adjust to the framework to\ndemonstrate that they made the world a better place ;-)\n\nAnd I think such an update can come after the dust settles in this\ncase. It is just a single simple test that is isolated and nobody\nother than the unit-test folks should care about, as the subject of\ntest has not seen any change for a long time.\n"},{"id":"490292","messageId":"80396270-46a5-49b0-88ed-44c1f48a2b30@gmail.com","threadId":"61073","inReplyTo":"xmqqttlghgqs.fsf@gitster.g","subject":"Re: What's cooking in git.git (Mar 2024, #02; Thu, 7)","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2024-03-09T11:34:42Z","receivedAt":"2024-03-09T11:34:44Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 08/03/2024 15:42, Junio C Hamano wrote:\n> Phillip Wood writes:\n> \n>> On 08/03/2024 02:26, Junio C Hamano wrote:\n>>> * rs/t-ctype-simplify (2024-03-03) 4 commits\n>>> (merged to 'next' on 2024-03-04 at 9bd84a8877)\n>>> + t-ctype: avoid duplicating class names\n>>> + t-ctype: align output of i\n>>> + t-ctype: simplify EOF check\n>>> + t-ctype: allow NUL anywhere in the specification string\n>>> Code simplification to one unit-test program.\n>>> Will merge to 'master'.\n>>> source: <20240303101330.20187-1-l.s.r@web.de>\n>>\n>> I have some concerns about the last patch of this series\n>> c.f. <0947cb09-8b07-4fcd-bbe2-ae37c2cd5ec7@gmail.com> It might be too\n>> late for this series but using the internal implementation functions\n>> rather than TEST() is not a pattern that I would want us to encourage.\n> \n> I actually think it is merely showing the lack of necessary features\n> in TEST() and other public macros/functions of the relatively new\n> low level test framework. If a user of the framework needs to use\n> the \"internal implementation functions\", that gives an incentive to\n> those who are pushing for the test framework to polish and update it,\n> so that such a framework client does not have to go deep into the\n> implementation details. When they come up with an improved framework,\n> they naturally have the first target to adjust to the framework to\n> demonstrate that they made the world a better place ;-)\n\nI think that's fair - I'll flesh out the details of a couple of helper \nmacros TEST_BEGIN and TEST_END for tests like this in consultation with \nRené in the other thread.\n\nI do hope though that unit test authors will feel free to improve the \nframework themselves if they find it lacking as a contributor writing an \nintegration test would do with the integration test framework. As we get \nmore experience with unit tests were bound to want more helper functions.\n\n> And I think such an update can come after the dust settles in this\n> case. It is just a single simple test that is isolated and nobody\n> other than the unit-test folks should care about, as the subject of\n> test has not seen any change for a long time.\n\nAgreed\n\nBest Wishes\n\nPhillip\n"}]}