Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). The 'maint' branch now points at the 2.44 maintenance track. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * 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 Doc updates. source: <20240229190229.20222-1-ericsunshine@xxxxxxxxxxx> * js/merge-base-with-missing-commit (2024-03-09) 13 commits (merged to 'next' on 2024-03-09 at caa7a7baaa) + merge-ort/merge-recursive: do report errors in `merge_submodule()` + merge-recursive: prepare for `merge_submodule()` to report errors (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 Originally merged to 'next' on 2024-02-29 Make sure failure return from merge_bases_many() is properly caught. source: <pull.1657.v4.git.1709113457.gitgitgadget@xxxxxxxxx> source: <pull.1686.git.1709993397.gitgitgadget@xxxxxxxxx> * 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. source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@xxxxxxxxxxxxxxx> * 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. source: <20240303101330.20187-1-l.s.r@xxxxxx> * 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". source: <20240304095436.56399-2-shejialuo@xxxxxxxxx> -------------------------------------------------- [New Topics] * jc/safe-implicit-bare (2024-03-11) 1 commit - setup: notice more types of implicit bare repositories Users with safe.bareRepository=explicit can still work from within $GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/) of the primary worktree without explicitly specifying the $GIT_DIR environment variable or the --git-dir=<path> option. Will merge to 'next'. source: <xmqq5xxv0ywi.fsf_-_@gitster.g> * pw/checkout-conflict-errorfix (2024-03-08) 4 commits - checkout: cleanup --conflict=<style> parsing - merge options: add a conflict style member - merge-ll: introduce LL_MERGE_OPTIONS_INIT - xdiff-interface: refactor parsing of merge.conflictstyle "git checkout --conflict=bad" reported a bad conflictStyle as if it were given to a configuration variable; it has been corrected to report that the command line option is bad. Expecting a reroll. cf. <1fb1c84a-b6b3-4e3e-896f-5fb93cff57a6@xxxxxxxxx> source: <pull.1684.git.1709907270.gitgitgadget@xxxxxxxxx> * bl/cherry-pick-empty (2024-03-11) 7 commits - cherry-pick: add `--empty` for more robust redundant commit handling - cherry-pick: enforce `--keep-redundant-commits` incompatibility - sequencer: do not require `allow_empty` for redundant commit options - sequencer: treat error reading HEAD as unborn branch - rebase: update `--empty=ask` to `--empty=stop` - docs: clean up `--empty` formatting in git-rebase(1) and git-am (1) - docs: address inaccurate `--empty` default with `--exec` source: <20240119060721.3734775-2-brianmlyles@xxxxxxxxx> * ie/config-includeif-hostname (2024-03-10) 1 commit - config: learn the "hostname:" includeIf condition source: <20240309181828.45496-2-ignacio@xxxxxxxxxxxx> * ja/doc-markup-fixes (2024-03-11) 6 commits - doc: git-clone: format placeholders - doc: git-clone: format verbatim words - doc: git-init: rework config item init.templateDir - doc: git-init: rework definition lists - doc: git-init: format placeholders - doc: git-init: format verbatim parts source: <pull.1687.git.1710097830.gitgitgadget@xxxxxxxxx> * jk/doc-remote-helper-object-format-option (2024-03-10) 2 commits - doc/gitremote-helpers: match object-format option docs to code - t5801: fix object-format handling in git-remote-testgit source: <20240307084735.GA2072130@xxxxxxxxxxxxxxxxxxxxxxx> * pb/ci-win-artifact-names-fix (2024-03-11) 1 commit - ci(github): make Windows test artifacts name unique source: <pull.1688.git.1710101097072.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [Cooking] * ag/t0010-modernize (2024-03-05) 1 commit (merged to 'next' on 2024-03-07 at 38339abc2d) + tests: modernize the test script t0010-racy-git.sh GSoC practice to modernize a test script. Will merge to 'master'. source: <pull.1675.v3.git.1709676557639.gitgitgadget@xxxxxxxxx> * fs/find-end-of-log-message-fix (2024-03-07) 1 commit - wt-status: don't find scissors line beyond buf len The code to find the effective end of log message can fall into an endless loop, which has been corrected. Waiting for review response. source: <20240307183743.219951-1-flosch@xxxxxxxxxxx> * hd/config-mak-os390 (2024-03-06) 1 commit (merged to 'next' on 2024-03-07 at 289d3ab691) + build: support z/OS (OS/390). Platform specific tweaks for OS/390 has been added to config.mak.uname. Will merge to 'master'. source: <pull.1663.v4.git.git.1709703857881.gitgitgadget@xxxxxxxxx> * jk/core-comment-string (2024-03-07) 15 commits - config: allow multi-byte core.commentChar - environment: drop comment_line_char compatibility macro - wt-status: drop custom comment-char stringification - sequencer: handle multi-byte comment characters when writing todo list - find multi-byte comment chars in unterminated buffers - find multi-byte comment chars in NUL-terminated strings - prefer comment_line_str to comment_line_char for printing - strbuf: accept a comment string for strbuf_add_commented_lines() - strbuf: accept a comment string for strbuf_commented_addf() - strbuf: accept a comment string for strbuf_stripspace() - environment: store comment_line_char as a string - strbuf: avoid shadowing global comment_line_char name - commit: refactor base-case of adjust_comment_line_char() - strbuf: avoid static variables in strbuf_add_commented_lines() - strbuf: simplify comment-handling in add_lines() helper core.commentChar used to be limited to a single byte, but has been updated to allow an arbitrary multi-byte sequence. Will merge to 'next'? source: <20240307091407.GA2072522@xxxxxxxxxxxxxxxxxxxxxxx> * jk/doc-remote-helpers-markup-fix (2024-03-07) 1 commit (merged to 'next' on 2024-03-08 at 2cded1c696) + doc/gitremote-helpers: fix missing single-quote Doc mark-up fix. Will merge to 'master'. source: <20240307084313.GA2072022@xxxxxxxxxxxxxxxxxxxxxxx> * js/build-fuzz-more-often (2024-03-05) 3 commits - SQUASH??? - fuzz: link fuzz programs with `make all` on Linux - ci: also define CXX environment variable In addition to building the objects needed, try to link the objects that are used in fuzzer tests, to make sure at least they build without bitrot, in Linux CI runs. Comments? source: <cover.1709673020.git.steadmon@xxxxxxxxxx> * kh/branch-ref-syntax-advice (2024-03-05) 5 commits (merged to 'next' on 2024-03-07 at 914f01967b) + branch: advise about ref syntax rules + advice: use double quotes for regular quoting + advice: use backticks for verbatim + advice: make all entries stylistically consistent + t3200: improve test style When git refuses to create a branch because the proposed branch name is not a valid refname, an advice message is given to refer the user to exact naming rules. Will merge to 'master'. source: <cover.1709670287.git.code@xxxxxxxxxxxxxxx> * kh/doc-commentchar-is-a-byte (2024-03-05) 1 commit (merged to 'next' on 2024-03-06 at 5941655c04) + config: document `core.commentChar` as ASCII-only The "core.commentChar" configuration variable only allows an ASCII character, which was not clearly documented, which has been corrected. Will merge to 'master'. source: <9633f9be5ddd9ab3df4b79ee934e1ed47e90bd1d.1709656683.git.code@xxxxxxxxxxxxxxx> * ps/reftable-block-search-fix (2024-03-07) 2 commits - reftable/block: fix binary search over restart counter - reftable/record: fix memory leak when decoding object records The reftable code has its own custom binary search function whose comparison callback has an unusual interface, which caused the binary search to degenerate into a linear search, which has been corrected. Will merge to 'next'? source: <cover.1709843663.git.ps@xxxxxx> * ps/reftable-reflog-iteration-perf (2024-03-05) 8 commits - refs/reftable: track last log record name via strbuf - reftable/record: use scratch buffer when decoding records - reftable/record: reuse message when decoding log records - reftable/record: reuse refnames when decoding log records - reftable/record: avoid copying author info - reftable/record: convert old and new object IDs to arrays - refs/reftable: reload correct stack when creating reflog iter - Merge branch 'ps/reftable-iteration-perf-part2' into ps/reftable-reflog-iteration-perf (this branch uses ps/reftable-iteration-perf-part2.) The code to iterate over reflogs in the reftable has been optimized to reduce memory allocation and deallocation. Reviewed-by: Josh Steadmon <steadmon@xxxxxxxxxx> cf. <Ze9eX-aaWoVaqsPP@xxxxxxxxxx> Will merge to 'next'? source: <cover.1709640322.git.ps@xxxxxx> * sj/userdiff-c-sharp (2024-03-06) 1 commit - userdiff: better method/property matching for C# The userdiff patterns for C# has been updated. Needs review. source: <pull.1682.v2.git.git.1709756493673.gitgitgadget@xxxxxxxxx> * jc/xwrite-cleanup (2024-03-02) 3 commits (merged to 'next' on 2024-03-07 at 43e66f7e4d) + 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. Will merge to 'master'. source: <20240302190348.3946569-1-gitster@xxxxxxxxx> * jc/test-i18ngrep (2024-03-02) 1 commit (merged to 'next' on 2024-03-06 at 2c57ebc706) + 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. Will merge to 'master'. source: <xmqq5xy4zhdc.fsf@gitster.g> * gt/core-bare-in-templates (2024-03-04) 1 commit (merged to 'next' on 2024-03-06 at e54ac5acf9) + setup: remove unnecessary variable Code simplification. Will merge to 'master'. source: <20240304151811.511780-1-shyamthakkar001@xxxxxxxxx> * so/clean-dry-run-without-force (2024-03-04) 2 commits (merged to 'next' on 2024-03-06 at ccf2e123be) + 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 'master'. source: <87le6ziqzb.fsf_-_@xxxxxxxxxxx> source: <20240303220600.2491792-1-gitster@xxxxxxxxx> * jh/trace2-missing-def-param-fix (2024-03-07) 3 commits (merged to 'next' on 2024-03-08 at a797cfea3c) + 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. Reviewed-by: Josh Steadmon <steadmon@xxxxxxxxxx> cf. <ZejkVOVQBZhLVfHW@xxxxxxxxxx> Will merge to 'master'. source: <pull.1679.v2.git.1709824949.gitgitgadget@xxxxxxxxx> * ps/reftable-stack-tempfile (2024-03-07) 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. Will merge to 'next'? source: <cover.1709816483.git.ps@xxxxxx> * 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@xxxxxx> * vm/t7301-use-test-path-helpers (2024-03-06) 1 commit (merged to 'next' on 2024-03-07 at e638654635) + t7301: use test_path_is_(missing|file) GSoC practice to replace "test -f" with "test_path_is_file". Will merge to 'master'. source: <20240304171732.64457-2-vincenzo.mezzela@xxxxxxxxx> * 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 Split libgit.a out to a separate git-std-lib tor easier reuse. Expecting a reroll. source: <cover.1696021277.git.jonathantanmy@xxxxxxxxxx> * rj/complete-worktree-paths-fix (2024-02-27) 1 commit (merged to 'next' on 2024-03-06 at b6ba949383) + completion: fix __git_complete_worktree_paths The logic to complete the command line arguments to "git worktree" subcommand (in contrib/) has been updated to correctly honor things like "git -C dir" etc. Will merge to 'master'. source: <b8f09e20-d0d3-4e0b-afe2-31affeb61052@xxxxxxxxx> * pw/rebase-i-ignore-cherry-pick-help-environment (2024-02-27) 1 commit (merged to 'next' on 2024-03-08 at e806ee9493) + rebase -i: stop setting GIT_CHERRY_PICK_HELP Code simplification by getting rid of code that sets an environment variable that is no longer used. Will merge to 'master'. source: <pull.1678.git.1709042783847.gitgitgadget@xxxxxxxxx> * as/option-names-in-messages (2024-03-05) 4 commits (merged to 'next' on 2024-03-07 at 73ab51faba) + revision.c: trivial fix to message + builtin/clone.c: trivial fix of message + builtin/remote.c: trivial fix of error message + transport-helper.c: trivial fix of error message Error message updates. Will merge to 'master'. source: <20240216101647.28837-1-ash@xxxxxxxxxxxxxx> * jh/fsmonitor-icase-corner-case-fix (2024-03-06) 14 commits (merged to 'next' on 2024-03-06 at 356eafea7e) + fsmonitor: support case-insensitive events + fsmonitor: refactor bit invalidation in refresh callback + fsmonitor: trace the new invalidated cache-entry count + fsmonitor: return invalidated cache-entry count on non-directory event + fsmonitor: remove custom loop from non-directory path handler + fsmonitor: return invalidated cache-entry count on directory event + fsmonitor: move untracked-cache invalidation into helper functions + fsmonitor: refactor untracked-cache invalidation + dir: create untracked_cache_invalidate_trimmed_path() + fsmonitor: refactor refresh callback for non-directory events + fsmonitor: clarify handling of directory events in callback helper + fsmonitor: refactor refresh callback on directory events + t7527: add case-insensitve test for FSMonitor + name-hash: add index_dir_find() FSMonitor client code was confused when FSEvents were given in a different case on a case-insensitive filesystem, which has been corrected. Acked-by: Patrick Steinhardt <ps@xxxxxx> cf. <ZehofMaSZyUq8S1N@tanuki> Will merge to 'master'. source: <pull.1662.v3.git.1708983565.gitgitgadget@xxxxxxxxx> * ps/reftable-iteration-perf-part2 (2024-03-04) 13 commits (merged to 'next' on 2024-03-06 at e8ba314585) + refs/reftable: precompute prefix length + reftable: allow inlining of a few functions + reftable/record: decode keys in place + reftable/record: reuse refname when copying + reftable/record: reuse refname when decoding + reftable/merged: avoid duplicate pqueue emptiness check + reftable/merged: circumvent pqueue with single subiter + reftable/merged: handle subiter cleanup on close only + reftable/merged: remove unnecessary null check for subiters + reftable/merged: make subiters own their records + reftable/merged: advance subiter on subsequent iteration + reftable/merged: make `merged_iter` structure private + reftable/pq: use `size_t` to track iterator index (this branch is used by ps/reftable-reflog-iteration-perf.) The code to iterate over refs with the reftable backend has seen some optimization. Will merge to 'master'. source: <cover.1709548907.git.ps@xxxxxx> * js/cmake-with-test-tool (2024-02-23) 2 commits - cmake: let `test-tool` run the unit tests, too - Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool (this branch uses js/unit-test-suite-runner.) "test-tool" is now built in CMake build to also run the unit tests. May want to roll it into the base topic. source: <pull.1666.git.1708038924522.gitgitgadget@xxxxxxxxx> * js/unit-test-suite-runner (2024-02-23) 8 commits - ci: use test-tool as unit test runner on Windows - t/Makefile: run unit tests alongside shell tests - unit tests: add rule for running with test-tool - test-tool run-command testsuite: support unit tests - test-tool run-command testsuite: remove hardcoded filter - test-tool run-command testsuite: get shell from env - t0080: turn t-basic unit test into a helper - Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner (this branch is used by js/cmake-with-test-tool.) The "test-tool" has been taught to run testsuite tests in parallel, bypassing the need to use the "prove" tool. Needs review. source: <cover.1708728717.git.steadmon@xxxxxxxxxx> * rj/complete-reflog (2024-03-03) 5 commits (merged to 'next' on 2024-03-06 at 0f1a25debc) + 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" The command line completion script (in contrib/) learned to complete "git reflog" better. Will merge to 'master'. source: <ea6c8890-9ff3-46c9-b933-6a52083b1001@xxxxxxxxx> * bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit - completion: dir-type optargs for am, format-patch Command line completion support (in contrib/) has been updated for a few commands to complete directory names where a directory name is expected. Expecting a reroll. cf. <40c3a824-a961-490b-94d4-4eb23c8f713d@xxxxxxxxx> cf. <6683f24e-7e56-489d-be2d-8afe1fc38d2b@xxxxxxxxx> source: <d37781c3-6af2-409b-95a8-660a9b92d20b@xxxxxxxxxxxxxxxxxxxxxxxxx> * bk/complete-send-email (2024-01-12) 1 commit - completion: don't complete revs when --no-format-patch Command line completion support (in contrib/) has been taught to avoid offering revision names as candidates to "git send-email" when the command is used to send pre-generated files. Expecting a reroll. cf. <CAC4O8c88Z3ZqxH2VVaNPpEGB3moL5dJcg3cOWuLWwQ_hLrJMtA@xxxxxxxxxxxxxx> source: <a718b5ee-afb0-44bd-a299-3208fac43506@xxxxxxxxxxxxxxxxxxxxxxxxx> * la/trailer-api (2024-03-01) 9 commits (merged to 'next' on 2024-03-06 at f119923ff6) + 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 Trailer API updates. Acked-by: Christian Couder <christian.couder@xxxxxxxxx> cf. <CAP8UFD1Zd+9q0z1JmfOf60S2vn5-sD3SafDvAJUzRFwHJKcb8A@xxxxxxxxxxxxxx> Will merge to 'master'. source: <pull.1632.v6.git.1709252086.gitgitgadget@xxxxxxxxx> * tb/path-filter-fix (2024-01-31) 16 commits - bloom: introduce `deinit_bloom_filters()` - commit-graph: reuse existing Bloom filters where possible - object.h: fix mis-aligned flag bits table - commit-graph: new Bloom filter version that fixes murmur3 - commit-graph: unconditionally load Bloom filters - bloom: prepare to discard incompatible Bloom filters - bloom: annotate filters with hash version - repo-settings: introduce commitgraph.changedPathsVersion - t4216: test changed path filters with high bit paths - t/helper/test-read-graph: implement `bloom-filters` mode - bloom.h: make `load_bloom_filter_from_graph()` public - t/helper/test-read-graph.c: extract `dump_graph_info()` - gitformat-commit-graph: describe version 2 of BDAT - commit-graph: ensure Bloom filters are read with consistent settings - revision.c: consult Bloom filters for root commits - t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()` The Bloom filter used for path limited history traversal was broken on systems whose "char" is unsigned; update the implementation and bump the format version to 2. Waiting for a final ack? cf. <ZcFjkfbsBfk7JQIH@nand.local> source: <cover.1706741516.git.me@xxxxxxxxxxxx> * eb/hash-transition (2023-10-02) 30 commits (merged to 'next' on 2024-03-11 at 9cff2e4ab7) + t1016-compatObjectFormat: add tests to verify the conversion between objects + t1006: test oid compatibility with cat-file + t1006: rename sha1 to oid + test-lib: compute the compatibility hash so tests may use it + builtin/ls-tree: let the oid determine the output algorithm + object-file: handle compat objects in check_object_signature + tree-walk: init_tree_desc take an oid to get the hash algorithm + builtin/cat-file: let the oid determine the output algorithm + rev-parse: add an --output-object-format parameter + repository: implement extensions.compatObjectFormat + object-file: update object_info_extended to reencode objects + object-file-convert: convert commits that embed signed tags + object-file-convert: convert commit objects when writing + object-file-convert: don't leak when converting tag objects + object-file-convert: convert tag objects when writing + object-file-convert: add a function to convert trees between algorithms + object: factor out parse_mode out of fast-import and tree-walk into in object.h + cache: add a function to read an OID of a specific algorithm + tag: sign both hashes + commit: export add_header_signature to support handling signatures on tags + commit: convert mergetag before computing the signature of a commit + commit: write commits for both hashes + object-file: add a compat_oid_in parameter to write_object_file_flags + object-file: update the loose object map when writing loose objects + loose: compatibilty short name support + loose: add a mapping between SHA-1 and SHA-256 for loose objects + repository: add a compatibility hash algorithm + object-names: support input of oids in any supported hash + oid-array: teach oid-array to handle multiple kinds of oids + object-file-convert: stubs for converting from one object format to another Teach a repository to work with both SHA-1 and SHA-256 hash algorithms. Will cook in 'next'. cf. <xmqqv86z5359.fsf@gitster.g> source: <878r8l929e.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> * jc/rerere-cleanup (2023-08-25) 4 commits - rerere: modernize use of empty strbuf - rerere: try_merge() should use LL_MERGE_ERROR when it means an error - rerere: fix comment on handle_file() helper - rerere: simplify check_one_conflict() helper function Code clean-up. Not ready to be reviewed yet. source: <20230824205456.1231371-1-gitster@xxxxxxxxx>
