{"thread":{"id":"61418","subject":"What's cooking in git.git (May 2024, #02; Fri, 3)","startedAt":"2024-05-04T00:28:09Z","lastAt":"2024-05-07T06:15:16Z","messageCount":7,"participants":["Junio C Hamano","Dragan Simic","Johannes Schindelin","Patrick Steinhardt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"494070","messageId":"xmqqa5l64e0i.fsf@gitster.g","threadId":"61418","inReplyTo":null,"subject":"What's cooking in git.git (May 2024, #02; Fri, 3)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-05-04T00:27:57Z","receivedAt":"2024-05-04T00:28:09Z","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\nQuite a few new topics have been added to 'seen', simply because I\nsaw them, which does not necessarily mean I agree with them or even\nread them carefully ;-)\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-scm/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* jc/test-workaround-broken-mv (2024-05-02) 1 commit\n - t/lib-chunk: work around broken \"mv\" on some vintage of macOS\n\n Tests that try to corrupt in-repository files in chunked format did\n not work well on macOS due to its broken \"mv\", which has been\n worked around.\n\n Will merge to 'next'.\n source: \n\n\n* jt/port-ci-whitespace-check-to-gitlab (2024-05-03) 5 commits\n - gitlab-ci: add whitespace error check\n - ci: make the whitespace report optional\n - ci: separate whitespace check script\n - github-ci: fix link to whitespace error\n - ci: pre-collapse GitLab CI sections\n\n The \"whitespace check\" task that was enabled for GitHub Actions CI\n has been ported to GitLab CI.\n\n Will merge to 'next'?\n source: <20240503172110.181326-1-jltobler@gmail.com>\n\n\n* jc/no-default-attr-tree-in-bare (2024-05-03) 1 commit\n - stop using HEAD for attributes in bare repository by default\n\n Git 2.43 started using the tree of HEAD as the source of attributes\n in a bare repository, which has severe performance implications.\n For now, revert the change, without ripping out a more explicit\n support for the attr.tree configuration variable.\n\n Will merge to 'next'?\n source: \n\n\n* jl/git-no-advice (2024-05-03) 3 commits\n - advice: add --no-advice global option\n - doc: add spacing around paginate options\n - doc: clean up usage documentation for --no-* opts\n\n A new global \"--no-advice\" option can be used to disable all advice\n messages, which is meant to be used only in scripts.\n\n Will merge to 'next'.\n source: <20240503071706.78109-1-james@jamesliu.io>\n\n\n* kn/ref-transaction-symref (2024-05-03) 7 commits\n - refs: remove `create_symref` and associated dead code\n - refs: rename `refs_create_symref()` to `refs_update_symref()`\n - refs: use transaction in `refs_create_symref()`\n - refs: add support for transactional symref updates\n - refs: support symrefs in 'reference-transaction' hook\n - files-backend: extract out `create_symref_lock()`\n - refs: accept symref values in `ref_transaction_update()`\n\n Updates to symbolic refs can now be made as a part of ref\n transaction.\n\n Will merge to 'next'?\n source: <20240503124115.252413-1-knayak@gitlab.com>\n\n\n* ma/win32-unix-domain-socket (2024-05-03) 1 commit\n - win32: fix building with NO_UNIX_SOCKETS\n\n Build fix.\n\n Will merge to 'next'.\n source: <20240503091427.2808390-1-mh@glandium.org>\n\n\n* ps/config-subcommands (2024-05-03) 14 commits\n - builtin/config: display subcommand help\n - builtin/config: introduce \"edit\" subcommand\n - builtin/config: introduce \"remove-section\" subcommand\n - builtin/config: introduce \"rename-section\" subcommand\n - builtin/config: introduce \"unset\" subcommand\n - builtin/config: introduce \"set\" subcommand\n - builtin/config: introduce \"get\" subcommand\n - builtin/config: introduce \"list\" subcommand\n - builtin/config: pull out function to handle `--null`\n - builtin/config: pull out function to handle config location\n - builtin/config: use `OPT_CMDMODE()` to specify modes\n - builtin/config: move \"fixed-value\" option to correct group\n - builtin/config: move option array around\n - config: clarify memory ownership when preparing comment strings\n\n The operation mode options (like \"--get\") the \"git config\" command\n uses have been deprecated and replaced with subcommands (like \"git\n config get\").\n\n Will merge to 'next'?\n source: \n\n\n* ps/refs-without-the-repository (2024-05-03) 5 commits\n - refs: remove functions without ref store\n - cocci: apply rules to rewrite callers of \"refs\" interfaces\n - cocci: introduce rules to transform \"refs\" to pass ref store\n - refs: add `exclude_patterns` parameter to `for_each_fullref_in()`\n - refs: introduce missing functions that accept a `struct ref_store`\n\n The refs API lost functions that implicitly assumes to work on the\n primary ref_store by forcing the callers to pass a ref_store as an\n argument.\n\n Will merge to 'next'?\n source: \n\n\n* ps/reftable-write-options (2024-05-03) 11 commits\n - refs/reftable: allow configuring geometric factor\n - reftable: make the compaction factor configurable\n - refs/reftable: allow disabling writing the object index\n - refs/reftable: allow configuring restart interval\n - reftable: use `uint16_t` to track restart interval\n - refs/reftable: allow configuring block size\n - reftable/dump: support dumping a table's block structure\n - reftable/writer: improve error when passed an invalid block size\n - reftable/writer: drop static variable used to initialize strbuf\n - reftable: consistently pass write opts as value\n - reftable: consistently refer to `reftable_write_options` as `opts`\n\n The knobs to tweak how reftable files are written have been made\n available as configuration variables.\n\n Needs review.\n source: \n\n\n* tb/attr-limits (2024-05-03) 1 commit\n - attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()\n\n The maximum size of attribute files is enforced more consistently.\n\n Will merge to 'next'.\n source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com>\n\n--------------------------------------------------\n[Graduated to 'master']\n\n* kn/update-ref-symrefs (2024-04-26) 7 commits\n - ref: support symrefs in 'reference-transaction' hook\n - update-ref: add support for 'symref-update' command\n - update-ref: add support for 'symref-create' command\n - update-ref: add support for 'symref-delete' command\n - update-ref: add support for 'symref-verify' command\n - files-backend: extract out `create_symref_lock`\n - refs: accept symref values in `ref_transaction[_add]_update`\n\n \"update-ref\" learns to also handle symbolic refs.\n\n Expecting a reroll.\n cf. \n source: <20240426152449.228860-1-knayak@gitlab.com>\n\n--------------------------------------------------\n[Cooking]\n\n* bb/rgb-12-bit-colors (2024-05-02) 3 commits\n (merged to 'next' on 2024-05-02 at 7fe29c98d7)\n + color: add support for 12-bit RGB colors\n + t/t4026-color: add test coverage for invalid RGB colors\n + t/t4026-color: remove an extra double quote character\n\n The color parsing code learned to handle 12-bit RGB colors, spelled\n as \"#RGB\" (in addition to \"#RRGGBB\" that is already supported).\n\n Will merge to 'master'.\n source: <20240502110331.6347-1-dev+git@drbeat.li>\n\n\n* ds/scalar-reconfigure-all-fix (2024-04-30) 1 commit\n - scalar: avoid segfault in reconfigure --all\n\n Scalar fix.\n\n Comments?\n source: \n\n\n* ps/pseudo-ref-terminology (2024-05-02) 10 commits\n - refs: refuse to write pseudorefs\n - ref-filter: properly distinuish pseudo and root refs\n - refs: pseudorefs are no refs\n - refs: root refs can be symbolic refs\n - refs: classify HEAD as a root ref\n - refs: refname `is_special_ref()` to `is_pseudo_ref()`\n - refs: rename `is_pseudoref()` to `is_root_ref()`\n - Documentation/glossary: define root refs as refs\n - Documentation/glossary: clarify limitations of pseudorefs\n - Documentation/glossary: redefine pseudorefs as special refs\n\n Terminology to call various ref-like things are getting\n straightened out.\n\n Comments?\n source: \n\n\n* dk/zsh-git-repo-path-fix (2024-04-30) 1 commit\n (merged to 'next' on 2024-05-02 at 0446d8e63a)\n + completion: zsh: stop leaking local cache variable\n\n Command line completion support for zsh (in contrib/) has been\n updated to stop exposing internal state to end-user shell\n interaction.\n\n Will merge to 'master'.\n source: \n\n\n* rs/diff-parseopts-cleanup (2024-05-01) 1 commit\n (merged to 'next' on 2024-05-02 at cd9779c175)\n + diff-lib: stop calling diff_setup_done() in do_diff_cache()\n\n Code clean-up to remove code that is now a noop.\n\n Will merge to 'master'.\n source: <0e96c5a3-7b4d-4c6b-875e-d80e3eb07a00@web.de>\n\n\n* rh/complete-symbolic-ref (2024-04-25) 3 commits\n (merged to 'next' on 2024-05-01 at 7020ecebe7)\n + completion: add docs on how to add subcommand completions\n + completion: improve docs for using __git_complete\n + completion: add 'symbolic-ref'\n\n Command line completion script (in contrib/) learned to complete\n \"git symbolic-ref\" a bit better (you need to enable plumbing\n commands to be completed with GIT_COMPLETION_SHOW_ALL_COMMANDS).\n\n Will merge to 'master'.\n source: <20240425101845.708554-3-rhi@pengutronix.de>\n\n\n* jt/doc-submitting-rerolled-series (2024-04-25) 1 commit\n (merged to 'next' on 2024-05-01 at 1c5865f11c)\n + doc: clarify practices for submitting updated patch versions\n\n Developer doc update.\n\n Will merge to 'master'.\n source: <20240425213404.133660-1-jltobler@gmail.com>\n\n\n* bc/zsh-compatibility (2024-04-26) 2 commits\n (merged to 'next' on 2024-05-02 at 10222b2472)\n + vimdiff: make script and tests work with zsh\n + t4046: avoid continue in &&-chain for zsh\n\n zsh can pretend to be a normal shell pretty well except for some\n glitches that we tickle in some of our scripts. Work them around\n so that \"vimdiff\" and our test suite works well enough with it.\n\n Will merge to 'master'.\n source: <20240426221154.2194139-1-sandals@crustytoothpaste.net>\n\n\n* jc/rev-parse-fatal-doc (2024-05-01) 1 commit\n - rev-parse: document how --is-* options work outside a repository\n\n Doc update.\n\n Comments?\n source: \n\n\n* ps/undecided-is-not-necessarily-sha1 (2024-04-30) 13 commits\n . repository: stop setting SHA1 as the default object hash\n . oss-fuzz/commit-graph: set up hash algorithm\n . builtin/shortlog: don't set up revisions without repo\n . builtin/diff: explicitly set hash algo when there is no repo\n . builtin/bundle: abort \"verify\" early when there is no repository\n . builtin/blame: don't access potentially unitialized `the_hash_algo`\n . builtin/rev-parse: allow shortening to more than 40 hex characters\n . remote-curl: fix parsing of detached SHA256 heads\n . attr: fix BUG() when parsing attrs outside of repo\n . attr: don't recompute default attribute source\n . parse-options-cb: only abbreviate hashes when hash algo is known\n . path: move `validate_headref()` to its only user\n . path: harden validation of HEAD with non-standard hashes\n\n Before discovering the repository details, We used to assume SHA-1\n as the \"default\" hash function, which has been corrected. Hopefully\n this will smoke out codepaths that rely on such an unwarranted\n assumptions.\n\n Seems to break t0003 with a NULL the_repository.\n\n Ejected out of 'seen' for now.\n source: \n\n\n* rj/add-p-typo-reaction (2024-04-30) 2 commits\n (merged to 'next' on 2024-05-01 at 3016062ebf)\n + add-patch: response to unknown command\n + add-patch: do not show UI messages on stderr\n\n When the user responds to a prompt given by \"git add -p\" with an\n unsupported command, list of available commands were given, which\n was too much if the user knew what they wanted to type but merely\n made a typo. Now the user gets a much shorter error message.\n\n Will merge to 'master'.\n source: <952a9514-3cf1-4601-8f0d-db57adc750c3@gmail.com>\n\n\n* ps/the-index-is-no-more (2024-04-18) 6 commits\n (merged to 'next' on 2024-05-01 at 7b9a0ab760)\n + repository: drop `initialize_the_repository()`\n + repository: drop `the_index` variable\n + builtin/clone: stop using `the_index`\n + repository: initialize index in `repo_init()`\n + builtin: stop using `the_index`\n + t/helper: stop using `the_index`\n\n The singleton index_state instance \"the_index\" has been eliminated\n by always instantiating \"the_repository\" and replacing references\n to \"the_index\" with references to its .index member.\n\n Will merge to 'master'.\n source: \n\n\n* ps/ci-test-with-jgit (2024-04-12) 13 commits\n (merged to 'next' on 2024-05-01 at 35e293e618)\n + t0612: add tests to exercise Git/JGit reftable compatibility\n + t0610: fix non-portable variable assignment\n + t06xx: always execute backend-specific tests\n + ci: install JGit dependency\n + ci: make Perforce binaries executable for all users\n + ci: merge scripts which install dependencies\n + ci: fix setup of custom path for GitLab CI\n + ci: merge custom PATH directories\n + ci: convert \"install-dependencies.sh\" to use \"/bin/sh\"\n + ci: drop duplicate package installation for \"linux-gcc-default\"\n + ci: skip sudo when we are already root\n + ci: expose distro name in dockerized GitHub jobs\n + ci: rename \"runs_on_pool\" to \"distro\"\n\n Tests to ensure interoperability between reftable written by jgit\n and our code have been added and enabled in CI.\n\n Will merge to 'master'.\n source: \n\n\n* pw/rebase-i-error-message (2024-04-08) 2 commits\n - rebase -i: improve error message when picking merge\n - rebase -i: pass struct replay_opts to parse_insn_line()\n\n When the user adds to \"git rebase -i\" instruction to \"pick\" a merge\n commit, the error experience is not pleasant. Such an error is now\n caught earlier in the process that parses the todo list.\n\n Expecting a reroll.\n cf. <88bc0787-e7ae-49e5-99e8-97f6c55ea8c6@gmail.com>\n source: \n\n\n* ps/reftable-write-optim (2024-04-08) 11 commits\n (merged to 'next' on 2024-04-30 at 0667e3c05b)\n + reftable/block: reuse compressed array\n + reftable/block: reuse zstream when writing log blocks\n + reftable/writer: reset `last_key` instead of releasing it\n + reftable/writer: unify releasing memory\n + reftable/writer: refactorings for `writer_flush_nonempty_block()`\n + reftable/writer: refactorings for `writer_add_record()`\n + refs/reftable: don't recompute committer ident\n + reftable: remove name checks\n + refs/reftable: skip duplicate name checks\n + refs/reftable: perform explicit D/F check when writing symrefs\n + refs/reftable: fix D/F conflict error message on ref copy\n\n Code to write out reftable has seen some optimization and\n simplification.\n\n Will merge to 'master'.\n source: \n\n\n* ds/send-email-per-message-block (2024-04-10) 2 commits\n - send-email: make it easy to discern the messages for each patch\n - send-email: move newline characters out of a few translatable strings\n\n \"git send-email\" learned to separate its reports on each message it\n sends out with an extra blank line in between.\n\n Comments?\n source: \n\n\n* ew/khash-to-khashl (2024-03-28) 3 commits\n - khashl: fix ensemble lookups on empty table\n - treewide: switch to khashl for memory savings\n - list-objects-filter: use kh_size API\n\n The hashtable library \"khash.h\" has been replaced with \"khashl.h\"\n that has better memory usage characteristics.\n\n Needs review.\n cf. \n source: <20240328101356.300374-1-e@80x24.org>\n\n\n* bc/credential-scheme-enhancement (2024-04-16) 16 commits\n (merged to 'next' on 2024-05-01 at 789ec5bd35)\n + credential: add method for querying capabilities\n + credential-cache: implement authtype capability\n + t: add credential tests for authtype\n + credential: add support for multistage credential rounds\n + t5563: refactor for multi-stage authentication\n + docs: set a limit on credential line length\n + credential: enable state capability\n + credential: add an argument to keep state\n + http: add support for authtype and credential\n + docs: indicate new credential protocol fields\n + credential: add a field called \"ephemeral\"\n + credential: gate new fields on capability\n + credential: add a field for pre-encoded credentials\n + http: use new headers for each object request\n + remote-curl: reset headers on new request\n + credential: add an authtype field\n\n The credential helper protocol, together with the HTTP layer, have\n been enhanced to support authentication schemes different from\n username & password pair, like Bearer and NTLM.\n\n Will merge to 'master'.\n source: <20240417000240.3611948-1-sandals@crustytoothpaste.net>\n\n\n* tb/pseudo-merge-reachability-bitmap (2024-04-30) 23 commits\n - t/perf: implement performace tests for pseudo-merge bitmaps\n - pseudo-merge: implement support for finding existing merges\n - ewah: `bitmap_equals_ewah()`\n - pack-bitmap: extra trace2 information\n - pack-bitmap.c: use pseudo-merges during traversal\n - t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`\n - pack-bitmap: implement test helpers for pseudo-merge\n - ewah: implement `ewah_bitmap_popcount()`\n - pseudo-merge: implement support for reading pseudo-merge commits\n - pack-bitmap.c: read pseudo-merge extension\n - pseudo-merge: scaffolding for reads\n - pack-bitmap: extract `read_bitmap()` function\n - pack-bitmap-write.c: write pseudo-merge table\n - pack-bitmap-write.c: select pseudo-merge commits\n - pseudo-merge: implement support for selecting pseudo-merge commits\n - pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public\n - pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`\n - pack-bitmap-write: support storing pseudo-merge commits\n - pseudo-merge.ch: initial commit\n - pack-bitmap: move some initialization to `bitmap_writer_init()`\n - pack-bitmap: drop unused `max_bitmaps` parameter\n - ewah: implement `ewah_bitmap_is_subset()`\n - Documentation/technical: describe pseudo-merge bitmaps format\n\n The pack-bitmap machinery learned to write pseudo-merge bitmaps,\n which act as imaginary octopus merges covering un-bitmapped\n reference tips. This enhances bitmap coverage, and thus,\n performance, for repositories with many references using bitmaps.\n\n Needs review.\n source: \n\n\n* la/hide-trailer-info (2024-05-02) 11 commits\n - trailer unit tests: inspect iterator contents\n - trailer: document parse_trailers() usage\n - trailer: retire trailer_info_get() from API\n - trailer: make trailer_info struct private\n - trailer: make parse_trailers() return trailer_info pointer\n - interpret-trailers: access trailer_info with new helpers\n - sequencer: use the trailer iterator\n - trailer: teach iterator about non-trailer lines\n - trailer: add unit tests for trailer iterator\n - Makefile: sort UNIT_TEST_PROGRAMS\n - Merge branch 'la/format-trailer-info' into la/hide-trailer-info\n\n The trailer API has been reshuffled a bit.\n\n Will merge to 'next'?\n source: \n\n\n* ds/doc-config-reflow (2024-03-14) 1 commit\n - config.txt: perform some minor reformatting\n\n Reflow a paragraph in the documentation source without any effect\n to the formatted text.\n\n Will discard.\n source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org>\n\n\n* ie/config-includeif-hostname (2024-03-19) 2 commits\n - config: learn the \"hostname:\" includeIf condition\n - t: add a test helper for getting hostname\n\n The conditional inclusion mechanism for configuration files learned\n to switch on the hostname.\n\n Expecting a reroll.\n cf. <20240319210428.GC1159535@coredump.intra.peff.net>\n cf. <20240320001934.GA903718@coredump.intra.peff.net>\n source: <20240319183722.211300-1-ignacio@iencinas.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/cmake-with-test-tool (2024-04-30) 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\n Will merge to 'next' together with the base topic.\n source: \n\n\n* js/unit-test-suite-runner (2024-04-30) 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 Will merge to 'next' together with js/cmake-with-test-tool?\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* 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* 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":"494072","messageId":"a07d3807a24f6d68cb48ee48366ae25e@manjaro.org","threadId":"61418","inReplyTo":"xmqqa5l64e0i.fsf@gitster.g","subject":"Re: What's cooking in git.git (May 2024, #02; Fri, 3)","fromName":"Dragan Simic","fromEmail":"dsimic@manjaro.org","sentAt":"2024-05-04T02:59:19Z","receivedAt":"2024-05-04T02:59:22Z","isPatch":false,"sender":{"key":"dsimic@manjaro.org","avatar":null},"body":"On 2024-05-04 02:27, Junio C Hamano wrote:\n> * ds/send-email-per-message-block (2024-04-10) 2 commits\n> - send-email: make it easy to discern the messages for each patch\n> - send-email: move newline characters out of a few translatable \n> strings\n> \n> \"git send-email\" learned to separate its reports on each message it\n> sends out with an extra blank line in between.\n> \n> Comments?\n> source: \n\nAfter thinking a bit more about these patches, I think that the second\npatch in the series (\"send-email: make it easy to discern the messages\nfor each patch\") should be dropped, but the first patch (\"send-email:\nmove newline characters out of a few translatable strings\") should have\nno roadblocks that prevent it from becoming applied to \"next\".\n\nThe reason why I'm proposing that the second patch gets dropped is that\nI now think there are better ways to utilize the vertical screen space\nin the outputs produced by \"git send-email\". I'll keep thinking about\nit for a while, and possibly submit a clean and irresistible [1] patch\nat some point in the future.\n\n[1] \nhttps://lore.kernel.org/git/72c114086590b9b15a3fdd9e0d6bd67e@manjaro.org/\n"},{"id":"494076","messageId":"b5226d6c-8038-4ab3-6e95-1a262282dd74@gmx.de","threadId":"61418","inReplyTo":"xmqqa5l64e0i.fsf@gitster.g","subject":"ds/scalar-reconfigure-all-fix, was Re: What's cooking in git.git (May 2024, #02; Fri, 3)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2024-05-04T08:58:36Z","receivedAt":"2024-05-04T08:58:43Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 3 May 2024, Junio C Hamano wrote:\n\n> * ds/scalar-reconfigure-all-fix (2024-04-30) 1 commit\n> - scalar: avoid segfault in reconfigure --all\n>\n> Scalar fix.\n>\n> Comments?\n> source: \n\nPatrick commented on it in the affirmative. I do not have anything in\naddition to Patrick's comments, except that I agree.\n\nCiao,\nJohannes\n"},{"id":"494138","messageId":"ZjihN01c8gWX0s9H@tanuki","threadId":"61418","inReplyTo":"xmqqa5l64e0i.fsf@gitster.g","subject":"Re: What's cooking in git.git (May 2024, #02; Fri, 3)","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2024-05-06T09:21:59Z","receivedAt":"2024-05-06T09:22:05Z","isPatch":false,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Fri, May 03, 2024 at 05:27:57PM -0700, Junio C Hamano wrote:\n> * ps/config-subcommands (2024-05-03) 14 commits\n> - builtin/config: display subcommand help\n> - builtin/config: introduce \"edit\" subcommand\n> - builtin/config: introduce \"remove-section\" subcommand\n> - builtin/config: introduce \"rename-section\" subcommand\n> - builtin/config: introduce \"unset\" subcommand\n> - builtin/config: introduce \"set\" subcommand\n> - builtin/config: introduce \"get\" subcommand\n> - builtin/config: introduce \"list\" subcommand\n> - builtin/config: pull out function to handle `--null`\n> - builtin/config: pull out function to handle config location\n> - builtin/config: use `OPT_CMDMODE()` to specify modes\n> - builtin/config: move \"fixed-value\" option to correct group\n> - builtin/config: move option array around\n> - config: clarify memory ownership when preparing comment strings\n> \n> The operation mode options (like \"--get\") the \"git config\" command\n> uses have been deprecated and replaced with subcommands (like \"git\n> config get\").\n> \n> Will merge to 'next'?\n> source: \n\nI have just sent out a new version [1] that fixes a few commit messages.\nOther than that I think this version should be ready to go.\n\n[1]: https://lore.kernel.org/git/cover.1714982328.git.ps@pks.im/T/#u\n\n> \n> * ps/refs-without-the-repository (2024-05-03) 5 commits\n> - refs: remove functions without ref store\n> - cocci: apply rules to rewrite callers of \"refs\" interfaces\n> - cocci: introduce rules to transform \"refs\" to pass ref store\n> - refs: add `exclude_patterns` parameter to `for_each_fullref_in()`\n> - refs: introduce missing functions that accept a `struct ref_store`\n> \n> The refs API lost functions that implicitly assumes to work on the\n> primary ref_store by forcing the callers to pass a ref_store as an\n> argument.\n> \n> Will merge to 'next'?\n> source: \n\nIt depends. Personally, I'm fine to merge this as-is and make this a\nhard breakage. I don't really feel like it's worth it to have extra\ncompatibility macros or something like that.\n\nIf we want to play nice with current in-flight topics I'd propose to\njust drop the last patch and reintroduce it in the next release cycle.\nThe downside here is that we may end up adding new callers to the old\ninterfaces, which may make us work against a moving target.\n\n> * ps/undecided-is-not-necessarily-sha1 (2024-04-30) 13 commits\n> . repository: stop setting SHA1 as the default object hash\n> . oss-fuzz/commit-graph: set up hash algorithm\n> . builtin/shortlog: don't set up revisions without repo\n> . builtin/diff: explicitly set hash algo when there is no repo\n> . builtin/bundle: abort \"verify\" early when there is no repository\n> . builtin/blame: don't access potentially unitialized `the_hash_algo`\n> . builtin/rev-parse: allow shortening to more than 40 hex characters\n> . remote-curl: fix parsing of detached SHA256 heads\n> . attr: fix BUG() when parsing attrs outside of repo\n> . attr: don't recompute default attribute source\n> . parse-options-cb: only abbreviate hashes when hash algo is known\n> . path: move `validate_headref()` to its only user\n> . path: harden validation of HEAD with non-standard hashes\n> \n> Before discovering the repository details, We used to assume SHA-1\n> as the \"default\" hash function, which has been corrected. Hopefully\n> this will smoke out codepaths that rely on such an unwarranted\n> assumptions.\n> \n> Seems to break t0003 with a NULL the_repository.\n> \n> Ejected out of 'seen' for now.\n> source: \n\nInteresting, I couldn't reproduce this issue when rebasing the patches\nonto \"seen\". There were merge conflicts though, both with\njc/no-default-attr-tree-in-bare and ps/the-index-is-no-more. So maybe\nthere was a mismerge involved somewhere?\n\nThe first one looks like the following. Given that this merge conflict\nhappened in \"attr.c\", I strongly suspect that this one was mis-merged\nbecause t0003 is about attrs, as well.\n\n diff --cc attr.c\n index 6af7151088,9d911aeb31..0000000000\n --- a/attr.c\n +++ b/attr.c\n @@@ -1223,8 -1224,15 +1224,8 @@@ static int compute_default_attr_source(\n ignore_bad_attr_tree = 1;\n }\n \n - \tif (!default_attr_source_tree_object_name || !is_null_oid(attr_source))\n - \t\treturn;\n -\tif (!default_attr_source_tree_object_name &&\n -\t startup_info->have_repository &&\n -\t is_bare_repository()) {\n -\t\tdefault_attr_source_tree_object_name = \"HEAD\";\n -\t\tignore_bad_attr_tree = 1;\n -\t}\n -\n + \tif (!default_attr_source_tree_object_name)\n + \t\treturn 0;\n \n if (repo_get_oid_treeish(the_repository,\n default_attr_source_tree_object_name,\n\nAnd the second conflict looks like this:\n\n diff --cc repository.c\n index 2118f563e3,b65b1a8c8b..0000000000\n --- a/repository.c\n +++ b/repository.c\n @@@ -17,35 -22,19 +17,15 @@@\n \n /* The main repository */\n static struct repository the_repo;\n -struct repository *the_repository;\n -struct index_state the_index;\n +struct repository *the_repository = &the_repo;\n \n -void initialize_the_repository(void)\n +void initialize_repository(struct repository *repo)\n {\n -\tthe_repository = &the_repo;\n -\n -\tthe_repo.index = &the_index;\n -\tthe_repo.objects = raw_object_store_new();\n -\tthe_repo.remote_state = remote_state_new();\n -\tthe_repo.parsed_objects = parsed_object_pool_new();\n -\n -\tindex_state_init(&the_index, the_repository);\n +\trepo->objects = raw_object_store_new();\n +\trepo->remote_state = remote_state_new();\n +\trepo->parsed_objects = parsed_object_pool_new();\n +\tALLOC_ARRAY(repo->index, 1);\n +\tindex_state_init(repo->index, repo);\n - \n - \t/*\n - \t * Unfortunately, we need to keep this hack around for the time being:\n - \t *\n - \t * - Not setting up the hash algorithm for `the_repository` leads to\n - \t * crashes because `the_hash_algo` is a macro that expands to\n - \t * `the_repository->hash_algo`. So if Git commands try to access\n - \t * `the_hash_algo` without a Git directory we crash.\n - \t *\n - \t * - Setting up the hash algorithm to be SHA1 by default breaks other\n - \t * commands when running with SHA256.\n - \t *\n - \t * This is another point in case why having global state is a bad idea.\n - \t * Eventually, we should remove this hack and stop setting the hash\n - \t * algorithm in this function altogether. Instead, it should only ever\n - \t * be set via our repository setup procedures. But that requires more\n - \t * work.\n - \t */\n - \tif (repo == the_repository)\n - \t\trepo_set_hash_algo(repo, GIT_HASH_SHA1);\n }\n \n static void expand_base_dir(char **out, const char *in,\n\nI'll maybe just revise the series and pull both of these topics in as a\ndependency.\n\n> * ps/ci-test-with-jgit (2024-04-12) 13 commits\n> (merged to 'next' on 2024-05-01 at 35e293e618)\n> + t0612: add tests to exercise Git/JGit reftable compatibility\n> + t0610: fix non-portable variable assignment\n> + t06xx: always execute backend-specific tests\n> + ci: install JGit dependency\n> + ci: make Perforce binaries executable for all users\n> + ci: merge scripts which install dependencies\n> + ci: fix setup of custom path for GitLab CI\n> + ci: merge custom PATH directories\n> + ci: convert \"install-dependencies.sh\" to use \"/bin/sh\"\n> + ci: drop duplicate package installation for \"linux-gcc-default\"\n> + ci: skip sudo when we are already root\n> + ci: expose distro name in dockerized GitHub jobs\n> + ci: rename \"runs_on_pool\" to \"distro\"\n> \n> Tests to ensure interoperability between reftable written by jgit\n> and our code have been added and enabled in CI.\n> \n> Will merge to 'master'.\n> source: \n\nI have sent a follow-up here [2] that unbreaks the \"ubuntu:latest\" jobs.\nThe breakage is caused by the release of Ubuntu 24.04, where there is no\nmore Python 2 anymore.\n\n[2]: https://lore.kernel.org/git/cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im/T/#u\n\nPatrick\n"},{"id":"494207","messageId":"xmqqy18mwpog.fsf@gitster.g","threadId":"61418","inReplyTo":"ZjihN01c8gWX0s9H@tanuki","subject":"Re: What's cooking in git.git (May 2024, #02; Fri, 3)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-05-06T22:17:35Z","receivedAt":"2024-05-06T22:17:37Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Patrick Steinhardt writes:\n\n> I have just sent out a new version [1] that fixes a few commit messages.\n> Other than that I think this version should be ready to go.\n>\n> [1]: https://lore.kernel.org/git/cover.1714982328.git.ps@pks.im/T/#u\n\nThanks.\n\n>> * ps/undecided-is-not-necessarily-sha1 (2024-04-30) 13 commits\n>> . repository: stop setting SHA1 as the default object hash\n>> . oss-fuzz/commit-graph: set up hash algorithm\n>> . builtin/shortlog: don't set up revisions without repo\n>> . builtin/diff: explicitly set hash algo when there is no repo\n>> . builtin/bundle: abort \"verify\" early when there is no repository\n>> . builtin/blame: don't access potentially unitialized `the_hash_algo`\n>> . builtin/rev-parse: allow shortening to more than 40 hex characters\n>> . remote-curl: fix parsing of detached SHA256 heads\n>> . attr: fix BUG() when parsing attrs outside of repo\n>> . attr: don't recompute default attribute source\n>> . parse-options-cb: only abbreviate hashes when hash algo is known\n>> . path: move `validate_headref()` to its only user\n>> . path: harden validation of HEAD with non-standard hashes\n>> \n>> Before discovering the repository details, We used to assume SHA-1\n>> as the \"default\" hash function, which has been corrected. Hopefully\n>> this will smoke out codepaths that rely on such an unwarranted\n>> assumptions.\n>> \n>> Seems to break t0003 with a NULL the_repository.\n>> \n>> Ejected out of 'seen' for now.\n>> source: \n>\n> Interesting, I couldn't reproduce this issue when rebasing the patches\n> onto \"seen\". There were merge conflicts though, both with\n> jc/no-default-attr-tree-in-bare and ps/the-index-is-no-more. So maybe\n> there was a mismerge involved somewhere?\n\nThat is very possible.\n"},{"id":"494248","messageId":"xmqqh6fatawj.fsf@gitster.g","threadId":"61418","inReplyTo":"xmqqy18mwpog.fsf@gitster.g","subject":"Re: What's cooking in git.git (May 2024, #02; Fri, 3)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-05-07T06:05:00Z","receivedAt":"2024-05-07T06:05:06Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n>>> * ps/undecided-is-not-necessarily-sha1 (2024-04-30) 13 commits\n>>> ...\n>> Interesting, I couldn't reproduce this issue when rebasing the patches\n>> onto \"seen\". There were merge conflicts though, both with\n>> jc/no-default-attr-tree-in-bare and ps/the-index-is-no-more. So maybe\n>> there was a mismerge involved somewhere?\n>\n> That is very possible.\n\nYeah, I think I botched the merge. Somehow my resolution had an\nunneeded \"|| !is_null_oid()\" in the result, but the right resolution\nof course should look like below.\n\nThanks.\n\ndiff --git c/attr.c w/attr.c\nindex 3afd477380..f3dd2de12d 100644\n--- c/attr.c\n+++ w/attr.c\n@@ -1214,53 +1214,31 @@ void set_git_attr_source(const char *tree_object_name)\n static int compute_default_attr_source(struct object_id *attr_source)\n {\n \tint ignore_bad_attr_tree = 0;\n \n \tif (!default_attr_source_tree_object_name)\n \t\tdefault_attr_source_tree_object_name = getenv(GIT_ATTR_SOURCE_ENVIRONMENT);\n \n \tif (!default_attr_source_tree_object_name && git_attr_tree) {\n \t\tdefault_attr_source_tree_object_name = git_attr_tree;\n \t\tignore_bad_attr_tree = 1;\n \t}\n \n-<<<<<<< HEAD\n-\tif (!default_attr_source_tree_object_name || !is_null_oid(attr_source))\n-\t\treturn;\n-||||||| 00e10ef10e\n-\tif (!default_attr_source_tree_object_name &&\n-\t startup_info->have_repository &&\n-\t is_bare_repository()) {\n-\t\tdefault_attr_source_tree_object_name = \"HEAD\";\n-\t\tignore_bad_attr_tree = 1;\n-\t}\n-\n-\tif (!default_attr_source_tree_object_name || !is_null_oid(attr_source))\n-\t\treturn;\n-=======\n-\tif (!default_attr_source_tree_object_name &&\n-\t startup_info->have_repository &&\n-\t is_bare_repository()) {\n-\t\tdefault_attr_source_tree_object_name = \"HEAD\";\n-\t\tignore_bad_attr_tree = 1;\n-\t}\n-\n \tif (!default_attr_source_tree_object_name)\n \t\treturn 0;\n \n \tif (!startup_info->have_repository) {\n \t\tif (!ignore_bad_attr_tree)\n \t\t\tdie(_(\"cannot use --attr-source or GIT_ATTR_SOURCE without repo\"));\n \t\treturn 0;\n \t}\n->>>>>>> ps/undecided-is-not-necessarily-sha1@{1}\n \n \tif (repo_get_oid_treeish(the_repository,\n \t\t\t\t default_attr_source_tree_object_name,\n \t\t\t\t attr_source)) {\n \t\tif (!ignore_bad_attr_tree)\n \t\t\tdie(_(\"bad --attr-source or GIT_ATTR_SOURCE\"));\n \t\treturn 0;\n \t}\n \n \treturn 1;\n }\n"},{"id":"494249","messageId":"ZjnG7XIKJMRr2K1j@tanuki","threadId":"61418","inReplyTo":"xmqqh6fatawj.fsf@gitster.g","subject":"Re: What's cooking in git.git (May 2024, #02; Fri, 3)","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2024-05-07T06:15:09Z","receivedAt":"2024-05-07T06:15:16Z","isPatch":false,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Mon, May 06, 2024 at 11:05:00PM -0700, Junio C Hamano wrote:\n> Junio C Hamano writes:\n> \n> >>> * ps/undecided-is-not-necessarily-sha1 (2024-04-30) 13 commits\n> >>> ...\n> >> Interesting, I couldn't reproduce this issue when rebasing the patches\n> >> onto \"seen\". There were merge conflicts though, both with\n> >> jc/no-default-attr-tree-in-bare and ps/the-index-is-no-more. So maybe\n> >> there was a mismerge involved somewhere?\n> >\n> > That is very possible.\n> \n> Yeah, I think I botched the merge. Somehow my resolution had an\n> unneeded \"|| !is_null_oid()\" in the result, but the right resolution\n> of course should look like below.\n> \n> Thanks.\n\nYeah, that resolution looks correct to me. I've also sent a v4 with\nincreased context and with the two conflicting topics pulles in as\ndependency. Other than that it is the same to v3.\n\nPatrick\n"}]}