{"thread":{"id":"60977","subject":"What's cooking in git.git (Feb 2024, #08; Thu, 22)","startedAt":"2024-02-23T17:16:55Z","lastAt":"2024-02-23T17:16:55Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"489240","messageId":"xmqqplwnw16m.fsf@gitster.g","threadId":"60977","inReplyTo":null,"subject":"What's cooking in git.git (Feb 2024, #08; Thu, 22)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-23T17:16:49Z","receivedAt":"2024-02-23T17:16:55Z","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\nGit 2.44 has been tagged, after fixing a last minute regression.\nGit 2.43.3 also has been tagged for the same fix.\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[New Topics]\n\n* ps/difftool-dir-diff-exit-code (2024-02-20) 1 commit\n (merged to 'next' on 2024-02-21 at a7bbef5a5f)\n + git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`\n\n \"git difftool --dir-diff\" learned to honor the \"--trust-exit-code\"\n option; it used to always exit with 0 and signalled success.\n\n Will cook in 'next'.\n source: <0fac668f8fc021af9f9c4df5134da59816307ccc.1708423309.git.ps@pks.im>\n\n\n* ds/doc-send-email-capitalization (2024-02-20) 1 commit\n (merged to 'next' on 2024-02-21 at c4aac4b993)\n + documentation: send-email: use camel case consistently\n\n Doc update.\n\n Will cook in 'next'.\n source: <88f1fe08c3047e14090957093ee8d98b0f60cb6c.1708467601.git.dsimic@manjaro.org>\n\n\n* ja/docfixes (2024-02-20) 3 commits\n (merged to 'next' on 2024-02-21 at 6d778ca672)\n + doc: end sentences with full-stop\n + doc: close unclosed angle-bracket of a placeholder in git-clone doc\n + doc: git-rev-parse: enforce command-line description syntax\n\n Doc update.\n\n Will cook in 'next'.\n source: \n\n\n* hs/rebase-not-in-progress (2024-02-21) 1 commit\n - rebase: make warning less passive aggressive\n\n Error message update.\n\n Will merge to 'next'.\n source: \n\n\n* jw/remote-doc-typofix (2024-02-21) 1 commit\n - git-remote.txt: fix typo\n\n Docfix.\n\n Will merge to 'next'.\n source: <20240221083554.5255-1-jwilk@jwilk.net>\n\n\n* ja/doc-placeholders-markup-rules (2024-02-21) 1 commit\n - doc: clarify the format of placeholders\n\n The way placeholders are to be marked-up in documentation have been\n specified; use \"__\" to typeset the word inside a pair\n of emphasized.\n\n Will merge to 'next'.\n source: \n\n\n* jc/doc-add-placeholder-fix (2024-02-21) 1 commit\n - doc: apply the new placeholder rules to git-add documentation\n\n Practice the new mark-up rule for with \"git add\"\n documentation page.\n\n Will merge to 'next'.\n source: \n\n--------------------------------------------------\n[Cooking]\n\n* as/option-names-in-messages (2024-02-16) 5 commits\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 - rebase: trivial fix of error message\n\n Error message updates.\n\n Expecting a reroll.\n source: <20240216101647.28837-1-ash@kambanaria.org>\n\n\n* bb/completion-no-grep-into-awk (2024-02-16) 1 commit\n (merged to 'next' on 2024-02-19 at 8373f95424)\n + completion: use awk for filtering the config entries\n\n Some parts of command line completion script (in contrib/) have\n been micro-optimized.\n\n Will cook in 'next'.\n source: <20240216171046.927552-1-dev+git@drbeat.li>\n\n\n* jb/doc-interactive-singlekey-do-not-need-perl (2024-02-19) 1 commit\n (merged to 'next' on 2024-02-19 at 9eda75497d)\n + doc: remove outdated information about interactive.singleKey\n\n Doc clean-up.\n\n Will cook in 'next'.\n source: <20240218030327.40453-1-julio.bacel@gmail.com>\n\n\n* jk/t0303-clean (2024-02-19) 2 commits\n (merged to 'next' on 2024-02-19 at f57b65215f)\n + t0303: check that helper_test_clean removes all credentials\n + Merge branch 'ba/credential-test-clean-fix' into jk/t0303-clean\n (this branch uses ba/credential-test-clean-fix.)\n\n Test clean-up.\n\n Will cook in 'next'.\n source: <20240217045814.GA539459@coredump.intra.peff.net>\n\n\n* km/mergetool-vimdiff-layout-fallback (2024-02-19) 1 commit\n (merged to 'next' on 2024-02-19 at bf7f086f05)\n + mergetools: vimdiff: use correct tool's name when reading mergetool config\n\n Variants of vimdiff learned to honor mergetool..layout settings.\n\n Will cook in 'next'.\n source: <20240217162718.21272-1-kipras@kipras.org>\n\n\n* mh/libsecret-empty-password-fix (2024-02-19) 1 commit\n (merged to 'next' on 2024-02-19 at b2e17695ca)\n + libsecret: retrieve empty password\n\n Credential helper based on libsecret (in contrib/) has been updated.\n\n Will cook in 'next'.\n source: \n\n\n* ps/reflog-list (2024-02-21) 9 commits\n - builtin/reflog: introduce subcommand to list reflogs\n - refs: stop resolving ref corresponding to reflogs\n - refs: drop unused params from the reflog iterator callback\n - refs: always treat iterators as ordered\n - refs/files: sort merged worktree and common reflogs\n - refs/files: sort reflogs returned by the reflog iterator\n - dir-iterator: support iteration in sorted order\n - dir-iterator: pass name to `prepare_next_entry_data()` directly\n + Merge branch 'ps/reftable-backend' into ps/reflog-list\n (this branch uses ps/reftable-backend.)\n\n \"git reflog\" learned a \"list\" subcommand that enumerates known reflogs.\n\n Will merge to 'next'.\n source: \n\n\n* jh/fsmonitor-icase-corner-case-fix (2024-02-14) 11 commits\n - t7527: update case-insenstive fsmonitor test\n - fsmonitor: refactor bit invalidation in refresh callback\n - fsmonitor: support case-insensitive non-directory events\n - fsmonitor: refactor non-directory callback\n - fsmonitor: support case-insensitive directory events\n - fsmonitor: refactor untracked-cache invalidation\n - fsmonitor: clarify handling of directory events in callback\n - fsmonitor: refactor refresh callback for non-directory events\n - fsmonitor: refactor refresh callback on directory events\n - t7527: add case-insensitve test for FSMonitor\n - name-hash: add index_dir_exists2()\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 Needs review.\n source: \n\n\n* mh/credential-oauth-refresh-token-with-osxkeychain (2024-02-14) 1 commit\n - credential/osxkeychain: store new attributes\n\n OAuth refresh tokens and password expiry timestamps are now stored\n in the osxkeychain backend , just the way libsecret and wincred\n backends of the credential subsystem do.\n\n Needs testing.\n cf. \n source: \n\n\n* ps/reftable-iteration-perf-part2 (2024-02-14) 13 commits\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 - Merge branch 'ps/reftable-iteration-perf' into ps/reftable-iteration-perf-part2\n (this branch uses ps/reftable-iteration-perf.)\n\n The code to iterate over refs with the reftable backend has seen\n some optimization.\n\n Needs review.\n source: \n\n\n* cp/t9146-use-test-path-helpers (2024-02-14) 1 commit\n (merged to 'next' on 2024-02-21 at 0b8356ef33)\n + t9146: replace test -d/-e/-f with appropriate test_path_is_* function\n\n Test script clean-up.\n\n Will cook in 'next'.\n source: \n\n\n* rj/tag-column-fix (2024-02-14) 1 commit\n (merged to 'next' on 2024-02-19 at 9aa52b4ffb)\n + tag: error when git-column fails\n\n \"git tag --column\" failed to check the exit status of its \"git\n column\" invocation, which has been corrected.\n\n Will cook in 'next'.\n source: <59df085d-0de8-45b1-9b8b-c69e91e56a1f@gmail.com>\n\n\n* jc/am-whitespace-doc (2024-02-14) 1 commit\n (merged to 'next' on 2024-02-19 at 492f0f9174)\n + doc: add shortcut to \"am --whitespace=\"\n\n \"git am --help\" now tells readers what actions are available in\n \"git am --whitespace=\", in addition to saying that the\n option is passed through to the underlying \"git apply\".\n\n Will cook in 'next'.\n source: \n\n\n* ba/credential-test-clean-fix (2024-02-15) 1 commit\n (merged to 'next' on 2024-02-19 at 290708b10a)\n + t/lib-credential: clean additional credential\n (this branch is used by jk/t0303-clean.)\n\n Test clean-up.\n\n Will cook in 'next'.\n source: \n\n\n* js/cmake-with-test-tool (2024-02-15) 1 commit\n - cmake: let `test-tool` run the unit tests, too\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* ps/ref-tests-update-even-more (2024-02-15) 7 commits\n (merged to 'next' on 2024-02-15 at 064b2b4089)\n + t7003: ensure filter-branch prunes reflogs with the reftable backend\n + t2011: exercise D/F conflicts with HEAD with the reftable backend\n + t1405: remove unneeded cleanup step\n + t1404: make D/F conflict tests compatible with reftable backend\n + t1400: exercise reflog with gaps with reftable backend\n + t0410: convert tests to use DEFAULT_REPO_FORMAT prereq\n + t: move tests exercising the \"files\" backend\n\n More tests that are marked as \"ref-files only\" have been updated to\n improve test coverage of reftable backend.\n\n Will cook in 'next'.\n source: \n\n\n* rs/use-xstrncmpz (2024-02-12) 1 commit\n (merged to 'next' on 2024-02-12 at 37e5f0fc14)\n + use xstrncmpz()\n\n Code clean-up.\n\n Will cook in 'next'.\n source: <954b75d0-1504-4f57-b34e-e770a4b7b3ea@web.de>\n\n\n* kn/for-all-refs (2024-02-12) 6 commits\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 (this branch uses ps/reftable-backend.)\n\n \"git for-each-ref\" filters its output with prefixes given from the\n command line, but it did not honor an empty string to mean \"pass\n everything\", which has been corrected.\n\n Expecting a reroll?\n source: <20240211183923.131278-1-karthik.188@gmail.com>\n\n\n* kh/column-reject-negative-padding (2024-02-13) 2 commits\n (merged to 'next' on 2024-02-14 at c30c08e495)\n + column: guard against negative padding\n + column: disallow negative padding\n\n \"git column\" has been taught to reject negative padding value, as\n it would lead to nonsense behaviour including division by zero.\n\n Will cook in 'next'.\n source: \n\n\n* jc/no-lazy-fetch (2024-02-16) 3 commits\n - git: extend --no-lazy-fetch to work across subprocesses\n - git: document GIT_NO_REPLACE_OBJECTS environment variable\n (merged to 'next' on 2024-02-13 at 7c7136e547)\n + git: --no-lazy-fetch option\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\n\n* jc/t9210-lazy-fix (2024-02-08) 1 commit\n (merged to 'next' on 2024-02-13 at fb61ca2fba)\n + t9210: do not rely on lazy fetching to fail\n (this branch is used by cc/rev-list-allow-missing-tips.)\n\n Adjust use of \"rev-list --missing\" in an existing tests so that it\n does not depend on a buggy failure mode.\n\n Will cook in 'next'.\n source: \n\n\n* gt/at-is-synonym-for-head-in-add-patch (2024-02-13) 2 commits\n (merged to 'next' on 2024-02-14 at cd901555d6)\n + add -p tests: remove PERL prerequisites\n + add-patch: classify '@' as a synonym for 'HEAD'\n\n Teach \"git checkout -p\" and friends that \"@\" is a synonym for\n \"HEAD\".\n\n Will cook in 'next'.\n source: <20240211202035.7196-2-shyamthakkar001@gmail.com>\n\n\n* js/unit-test-suite-runner (2024-02-03) 7 commits\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 Expecting a reroll.\n cf. <20240207225802.GA538110@coredump.intra.peff.net>\n source: \n\n\n* ps/reftable-backend (2024-02-07) 3 commits\n (merged to 'next' on 2024-02-08 at ba1c4c52bb)\n + refs/reftable: fix leak when copying reflog fails\n (merged to 'next' on 2024-02-07 at 1115200acb)\n + ci: add jobs to test with the reftable backend\n + refs: introduce reftable backend\n (this branch is used by kn/for-all-refs and ps/reflog-list.)\n\n Integrate the reftable code into the refs framework as a backend.\n\n Will cook in 'next'.\n source: \n\n\n* cc/rev-list-allow-missing-tips (2024-02-14) 4 commits\n (merged to 'next' on 2024-02-21 at 9b63eec23f)\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 (this branch uses jc/t9210-lazy-fix.)\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 Will cook in 'next'.\n source: <20240214142513.4002639-1-christian.couder@gmail.com>\n\n\n* ps/reftable-iteration-perf (2024-02-12) 7 commits\n (merged to 'next' on 2024-02-12 at 6abaf58383)\n + reftable/reader: add comments to `table_iter_next()`\n + reftable/record: don't try to reallocate ref record name\n + reftable/block: swap buffers instead of copying\n + reftable/pq: allocation-less comparison of entry keys\n + reftable/merged: skip comparison for records of the same subiter\n + reftable/merged: allocation-less dropping of shadowed records\n + reftable/record: introduce function to compare records by key\n (this branch is used by ps/reftable-iteration-perf-part2.)\n\n The code to iterate over refs with the reftable backend has seen\n some optimization.\n\n Will cook in 'next'.\n source: \n\n\n* js/merge-tree-3-trees (2024-02-22) 6 commits\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 (merged to 'next' on 2024-01-30 at 0c77b04e59)\n + merge-tree: accept 3 trees as arguments\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\n Comments?\n source: \n source: \n\n\n* rj/complete-reflog (2024-01-26) 4 commits\n - completion: reflog show \n - completion: reflog with implicit \"show\"\n - completion: introduce __git_find_subcommand\n - completion: introduce __gitcomp_subcommand\n\n The command line completion script (in contrib/) learned to\n complete \"git reflog\" better.\n\n Expecting a reroll.\n cf. \n source: <98daf977-dbad-4d3b-a293-6a769895088f@gmail.com>\n\n\n* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-02-12) 2 commits\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 \"git log --merge\" learned to pay attention to CHERRY_PICK_HEAD and\n other kinds of *_HEAD pseudorefs.\n\n Expecting a reroll.\n cf. <790a3f11-5a8c-42f2-7a35-f2900c0299b4@gmail.com>\n cf. <8384d1dc-b6c4-b853-9bf6-3d7ccee86d12@gmail.com>\n source: <20240210-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v4-0-3bc9e62808f4@gmail.com>\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 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-02-16) 9 commits\n (merged to 'next' on 2024-02-21 at 631e28bbbc)\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: start preparing for formatting unification\n + trailer: move interpret_trailers() to interpret-trailers.c\n + trailer: prepare to expose functions as part of API\n + shortlog: add test for de-duplicating folded trailers\n + trailer: free trailer_info _after_ all related usage\n\n Code clean-up.\n\n Will cook in 'next'.\n source: \n\n\n* cp/apply-core-filemode (2023-12-26) 3 commits\n (merged to 'next' on 2024-02-07 at 089a3fbb86)\n + apply: code simplification\n + apply: correctly reverse patch's pre- and post-image mode bits\n + apply: ignore working tree filemode when !core.filemode\n\n \"git apply\" on a filesystem without filemode support have learned\n to take a hint from what is in the index for the path, even when\n not working with the \"--index\" or \"--cached\" option, when checking\n the executable bit match what is required by the preimage in the\n patch.\n\n Will cook in 'next'.\n cf. \n source: <20231226233218.472054-1-gitster@pobox.com>\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"}]}