{"thread":{"id":"63120","subject":"What's cooking in git.git (Mar 2025, #04; Fri, 14)","startedAt":"2025-03-14T17:36:42Z","lastAt":"2025-03-21T07:51:50Z","messageCount":15,"participants":["Junio C Hamano","Jeff King","Elijah Newren","Karthik Nayak","Patrick Steinhardt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"514284","messageId":"xmqqv7sbfra0.fsf@gitster.g","threadId":"63120","inReplyTo":null,"subject":"What's cooking in git.git (Mar 2025, #04; Fri, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-14T17:36:39Z","receivedAt":"2025-03-14T17:36:42Z","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.49 final has been tagged.\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* en/diff-rename-follow-fix (2025-03-13) 1 commit\n - diffcore-rename: fix BUG when break detection and --follow used together\n\n A corner-case bug in \"git log --follow -B\" has been fixed.\n\n Will merge to 'next'.\n source: \n\n--------------------------------------------------\n[Cooking]\n\n* en/merge-ort-prepare-to-remove-recursive (2025-03-13) 6 commits\n - am: switch from merge_recursive_generic() to merge_ort_generic()\n - merge-ort: fix merge.directoryRenames=false\n - t3650: document bug when directory renames are turned off\n - merge-ort: support having merge verbosity be set to 0\n - merge-ort: allow rename detection to be disabled\n - merge-ort: add new merge_ort_generic() function\n\n First step of deprecating and removing merge-recursive.\n\n Will merge to 'next'.\n source: \n\n\n* jk/use-wunreachable-code-for-devs (2025-03-07) 1 commit\n (merged to 'next' on 2025-03-07 at b5c54fea6a)\n + config.mak.dev: enable -Wunreachable-code\n\n Enable -Wunreachable-code for developer builds.\n\n Reverted out of 'next', as macOS CI job stops with a false positive.\n cf. <20250310160440.GA26189@coredump.intra.peff.net>\n source: <20250307225444.GA42758@coredump.intra.peff.net>\n\n\n* ab/decorate-code-cleanup (2025-03-10) 1 commit\n - decorate: fix sign comparison warnings\n\n Code clean-up.\n\n Will merge to 'next'.\n source: <7c219279-8151-49c0-8fc0-8abe2624aca9@gmail.com>\n\n\n* ds/path-walk-2 (2025-03-10) 13 commits\n - pack-objects: allow --shallow and --path-walk\n - path-walk: add new 'edge_aggressive' option\n - pack-objects: thread the path-based compression\n - pack-objects: refactor path-walk delta phase\n - scalar: enable path-walk during push via config\n - pack-objects: enable --path-walk via config\n - repack: add --path-walk option\n - t5538: add tests to confirm deltas in shallow pushes\n - pack-objects: introduce GIT_TEST_PACK_PATH_WALK\n - p5313: add performance tests for --path-walk\n - pack-objects: update usage to match docs\n - pack-objects: add --path-walk option\n - pack-objects: extract should_attempt_deltas()\n\n \"git pack-objects\" learns to find delta bases from blobs at the\n same path, using the --path-walk API.\n source: \n\n\n* ja/doc-block-delimiter-markup-fix (2025-03-10) 1 commit\n (merged to 'next' on 2025-03-11 at 8d6641a77e)\n + doc: add a blank line around block delimiters\n\n Doc markup updates.\n\n Will cook in 'next'.\n source: \n\n\n* jc/name-rev-stdin (2025-03-12) 6 commits\n - name-rev: remove \"--stdin\" support\n - t6120: further modernize\n - t6120: avoid hiding \"git\" exit status\n - t: introduce WITH_BREAKING_CHANGES prerequisite\n - t: extend test_lazy_prereq\n - t: document test_lazy_prereq\n\n Using \"git name-rev --stdin\" as an example, improve the framework to\n prepare tests to pretend to be in the future where the breaking\n changes have already happened.\n\n Will merge to 'next'.\n source: <20250311212505.2920181-1-gitster@pobox.com>\n\n\n* jk/fetch-ref-prefix-cleanup (2025-03-10) 9 commits\n - fetch: use ref prefix list to skip ls-refs\n - fetch: avoid ls-refs only to ask for HEAD symref update\n - fetch: stop protecting additions to ref-prefix list\n - fetch: ask server to advertise HEAD for config-less fetch\n - refspec_ref_prefixes(): clean up refspec_item logic\n - t5516: beef up exact-oid ref prefixes test\n - t5516: drop NEEDSWORK about v2 reachability behavior\n - t5516: prefer \"oid\" to \"sha1\" in some test titles\n - t5702: fix typo in test name\n\n In protocol v2 where the refs advertisement is constrained, we try\n to tell the server side not to limit the advertisement when there\n is no specific need to, which has been the source of confusion and\n recent bugs. Revamp the logic to simplify.\n\n Will merge to 'next'.\n source: <20250309030101.GA2334064@coredump.intra.peff.net>\n\n\n* jt/rev-list-z (2025-03-13) 6 commits\n - rev-list: support NUL-delimited --missing option\n - rev-list: support NUL-delimited --boundary option\n - rev-list: support delimiting objects with NUL bytes\n - revision: support NUL-delimited --stdin mode\n - rev-list: refactor early option parsing\n - rev-list: inline `show_object_with_name()` in `show_object()`\n\n \"git rev-list\" learns machine-parsable output format that delimits\n each field with NUL.\n\n Will merge to 'next'?\n source: <20250313001706.3390502-1-jltobler@gmail.com>\n\n\n* kn/reflog-drop (2025-03-10) 1 commit\n - reflog: implement subcommand to drop reflogs\n\n \"git reflog\" learns \"drop\" subcommand, that discards the entire\n reflog data for a ref.\n\n Will merge to 'next'?\n source: <20250310-493-add-command-to-purge-reflog-entries-v2-1-05caa92e0bfa@gmail.com>\n\n\n* am/dir-dedup-decl-of-repository (2025-03-11) 1 commit\n - dir.h: remove duplicate forward declaration of struct repository\n\n Code cleanup.\n\n Will merge to 'next'.\n source: \n\n\n* cc/lop-remote (2025-03-13) 1 commit\n - promisor-remote: fix segfault when remote URL is missing\n\n Bugfix in newly introduced large-object-promisor remote support.\n\n Will merge to 'next'?\n source: <20250313103859.817127-1-christian.couder@gmail.com>\n\n\n* ps/ci-meson-check-build-docs (2025-03-12) 1 commit\n - ci: perform build and smoke tests for Meson docs\n\n CI update.\n\n Will merge to 'next'.\n source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>\n\n\n* ps/meson-with-breaking-changes (2025-03-12) 3 commits\n - meson: don't install git-pack-redundant(1) docs with breaking changes\n - meson: don't compile git-pack-redundant(1) with breaking changes\n - meson: define WITH_BREAKING_CHANGES when enabling breaking changes\n\n Update meson based build procedure for breaking changes support.\n\n Will merge to 'next'.\n source: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im>\n\n\n* md/t1403-path-is-file (2025-03-04) 1 commit\n - t1403: verify that path exists and is a file\n\n Test tweak.\n source: <20250304112728.41228-2-danimahendra0904@gmail.com>\n\n\n* sk/clar-trailer-urlmatch-norm-test (2025-03-04) 2 commits\n - t/unit-tests: convert urlmatch-normalization test to clar\n - t/unit-tests: convert trailer test to use clar\n\n A few traditional unit tests have been rewritten to use the clar\n framework.\n\n Comments?\n source: <20250304113323.10564-1-kuforiji98@gmail.com>\n\n\n* dm/completion-remote-names-fix (2025-03-05) 2 commits\n - completion: fix bugs with slashes in remote names\n - completion: add helper to count path components\n\n The bash command line completion script (in contrib/) has been\n updated to cope with remote repository nicknames with slashes in\n them.\n\n Comments?\n source: \n\n\n* tb/refs-exclude-fixes (2025-03-06) 2 commits\n (merged to 'next' on 2025-03-06 at 50707f29db)\n + refs.c: stop matching non-directory prefixes in exclude patterns\n + refs.c: remove empty '--exclude' patterns\n\n The refname exclusion logic in the packed-ref backend has been\n broken for some time, which confused upload-pack to advertise\n different set of refs. This has been corrected.\n\n Will cook in 'next'.\n source: \n\n\n* en/merge-process-renames-crash-fix (2025-03-06) 2 commits\n (merged to 'next' on 2025-03-06 at 8f38331e32)\n + merge-ort: fix slightly overzealous assertion for rename-to-self\n + t6423: add a testcase causing a failed assertion in process_renames\n\n The merge-recursive and merge-ort machinery crashed in corner cases\n when certain renames are involved.\n\n Will cook in 'next'.\n source: \n\n\n* kn/non-transactional-batch-updates (2025-03-12) 9 commits\n . update-ref: add --allow-partial flag for stdin mode\n . refs: support partial update rejections during F/D checks\n . refs: implement partial reference transaction support\n . refs: introduce enum-based transaction error types\n . refs/reftable: extract code from the transaction preparation\n . refs/files: remove duplicate duplicates check\n . refs: move duplicate refname update check to generic layer\n . refs/files: remove redundant check in split_symref_update()\n . Merge branch 'ps/refname-avail-check-optim' into kn/non-transactional-batch-updates\n (this branch uses ps/refname-avail-check-optim.)\n\n Updating multiple references have only been possible in all-or-none\n fashion with transactions, but it can be more efficient to batch\n multiple updates even when some of them are allowed to fail in a\n best-effort manner. A new \"best effort batches of updates\" mode\n has been introduced.\n\n Trips up -Wunreachable-code checker.\n source: <20250305-245-partially-atomic-ref-updates-v3-0-0c64e3052354@gmail.com>\n\n\n* ps/object-wo-the-repository (2025-03-10) 12 commits\n - hash: stop depending on `the_repository` in `null_oid()`\n - hash: fix \"-Wsign-compare\" warnings\n - object-file: split out logic regarding hash algorithms\n - delta-islands: stop depending on `the_repository`\n - object-file-convert: stop depending on `the_repository`\n - pack-bitmap-write: stop depending on `the_repository`\n - pack-revindex: stop depending on `the_repository`\n - pack-check: stop depending on `the_repository`\n - environment: move access to \"core.bigFileThreshold\" into repo settings\n - pack-write: stop depending on `the_repository` and `the_hash_algo`\n - object: stop depending on `the_repository`\n - csum-file: stop depending on `the_repository`\n\n The object layer has been updated to take an explicit repository\n instance as a parameter in more code paths.\n\n Looking good.\n source: <20250310-b4-pks-objects-without-the-repository-v4-0-f201b8ec57ba@pks.im>\n\n\n* ua/some-builtins-wo-the-repository (2025-03-07) 8 commits\n (merged to 'next' on 2025-03-07 at 01f2b84529)\n + builtin/checkout-index: stop using `the_repository`\n + builtin/for-each-ref: stop using `the_repository`\n + builtin/ls-files: stop using `the_repository`\n + builtin/pack-refs: stop using `the_repository`\n + builtin/send-pack: stop using `the_repository`\n + builtin/verify-commit: stop using `the_repository`\n + builtin/verify-tag: stop using `the_repository`\n + config: teach repo_config to allow `repo` to be NULL\n\n A handful of built-in command implementations have been rewritten\n to use the repository instance supplied by git.c:run_builtin(), its\n caller.\n\n Will cook in 'next'.\n source: <20250307233543.1721552-1-usmanakinyemi202@gmail.com>\n\n\n* ps/maintenance-reflog-expire (2025-02-26) 6 commits\n - builtin/maintenance: introduce \"reflog-expire\" task\n - builtin/gc: split out function to expire reflog entries\n - builtin/reflog: make functions regarding `reflog_expire_options` public\n - builtin/reflog: stop storing per-reflog expiry dates globally\n - builtin/reflog: stop storing default reflog expiry dates globally\n - reflog: rename `cmd_reflog_expire_cb` to `reflog_expire_options`\n\n \"git maintenance\" learns a new task to expire reflog entries.\n\n Needs (real) review.\n source: <20250226-pks-maintenance-reflog-expire-v1-0-a1204a814952@pks.im>\n\n\n* ps/refname-avail-check-optim (2025-03-12) 16 commits\n - refs: reuse iterators when determining refname availability\n - refs/iterator: implement seeking for files iterators\n - refs/iterator: implement seeking for packed-ref iterators\n - refs/iterator: implement seeking for ref-cache iterators\n - refs/iterator: implement seeking for reftable iterators\n - refs/iterator: implement seeking for merged iterators\n - refs/iterator: provide infrastructure to re-seek iterators\n - refs/iterator: separate lifecycle from iteration\n - refs: stop re-verifying common prefixes for availability\n - refs/files: batch refname availability checks for initial transactions\n - refs/files: batch refname availability checks for normal transactions\n - refs/reftable: batch refname availability checks\n - refs: introduce function to batch refname availability checks\n - builtin/update-ref: skip ambiguity checks when parsing object IDs\n - object-name: allow skipping ambiguity checks in `get_oid()` family\n - object-name: introduce `repo_get_oid_with_flags()`\n (this branch is used by kn/non-transactional-batch-updates.)\n\n The code paths to check whether a refname X is available (by seeing\n if another ref X/Y exists, etc.) have been optimized.\n\n Will merge to 'next'.\n source: <20250312-pks-update-ref-optimization-v6-0-f778e0414f55@pks.im>\n\n\n* tb/multi-cruft-pack-refresh-fix (2025-03-13) 1 commit\n - builtin/pack-objects.c: freshen objects from existing cruft packs\n\n Certain \"cruft\" objects would have never been refreshed when there\n are multiple cruft packs in the repository, which has been\n corrected.\n\n Will merge to 'next'.\n source: <1563552bbda0bc910c9f41b0fabc3225c4d778fc.1741889018.git.me@ttaylorr.com>\n\n\n* jk/zlib-inflate-fixes (2025-02-25) 10 commits\n - unpack_loose_rest(): rewrite return handling for clarity\n - unpack_loose_rest(): simplify error handling\n - unpack_loose_rest(): never clean up zstream\n - unpack_loose_rest(): avoid numeric comparison of zlib status\n - unpack_loose_header(): avoid numeric comparison of zlib status\n - git_inflate(): skip zlib_post_call() sanity check on Z_NEED_DICT\n - unpack_loose_header(): fix infinite loop on broken zlib input\n - unpack_loose_header(): report headers without NUL as \"bad\"\n - unpack_loose_header(): simplify next_out assignment\n - loose_object_info(): BUG() on inflating content with unknown type\n\n Fix our use of zlib corner cases.\n\n Still being discussed.\n cf. <20250304065501.GB1283901@coredump.intra.peff.net>\n source: <20250225062518.GA1293854@coredump.intra.peff.net>\n\n\n* cc/signed-fast-export-import (2025-03-10) 6 commits\n - fast-export, fast-import: add support for signed-commits\n - fast-export: do not modify memory from get_commit_buffer\n - git-fast-export.adoc: clarify why 'verbatim' may not be a good idea\n - fast-export: rename --signed-tags='warn' to 'warn-verbatim'\n - fast-export: fix missing whitespace after switch\n - git-fast-import.adoc: add missing LF in the BNF\n\n \"git fast-export | git fast-import\" learns to deal with commit and\n tag objects with embedded signatures a bit better.\n\n Will merge to 'next'.\n cf. \n source: <20250310155746.879481-1-christian.couder@gmail.com>\n\n\n* jt/diff-pairs (2025-03-03) 4 commits\n (merged to 'next' on 2025-03-03 at 32346e0c3b)\n + builtin/diff-pairs: allow explicit diff queue flush\n + builtin: introduce diff-pairs command\n + diff: add option to skip resolving diff statuses\n + diff: return diff_filepair from diff queue helpers\n\n A post-processing filter for \"diff --raw\" output has been\n introduced.\n\n Will cook in 'next'.\n source: <20250228213346.1335224-1-jltobler@gmail.com>\n\n\n* ib/diff-S-G-with-longhand (2025-02-12) 10 commits\n - diff: docs: Use --patch-{grep,modifies} over -G/-S\n - diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies}\n - diff: test: Use --patch-{grep,modifies} over -G/-S\n - completion: Support --patch-{grep,modifies}\n - diff: --patch-{grep,modifies} arg names for -G and -S\n - docs: gitdiffcore: -G and -S: Use regex/string placeholders\n - diff: short help: Add -G and --pickaxe-grep\n - diff: short help: Correct -S description\n - diff: -G description: Correct copy/paste error\n - t/t4209-log-pickaxe: Naming typo: -G takes a regex\n\n The commands in the \"diff\" family learned longhands for \"-S\" and\n \"-G\" options.\n\n The core part looked mostly good.\n source: <20250212032657.1807939-1-illia.bobyr@gmail.com>\n\n\n* ps/reftable-windows-unlink-fix (2025-02-18) 2 commits\n - reftable: ignore file-in-use errors when unlink(3p) fails on Windows\n - Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-windows-unlink-fix\n (this branch uses ps/reftable-sans-compat-util.)\n\n Portability fix.\n\n Waiting for the base topic to settle.\n source: <20250206-b4-pks-reftable-win32-in-use-errors-v2-1-56985a4f6186@pks.im>\n\n\n* ps/reftable-sans-compat-util (2025-02-18) 18 commits\n - Makefile: skip reftable library for Coccinelle\n - reftable: decouple from Git codebase by pulling in \"compat/posix.h\"\n - git-compat-util.h: split out POSIX-emulating bits\n - compat/mingw: split out POSIX-related bits\n - reftable/basics: introduce `REFTABLE_UNUSED` annotation\n - reftable/basics: stop using `SWAP()` macro\n - reftable/stack: stop using `sleep_millisec()`\n - reftable/system: introduce `reftable_rand()`\n - reftable/reader: stop using `ARRAY_SIZE()` macro\n - reftable/basics: provide wrappers for big endian conversion\n - reftable/basics: stop using `st_mult()` in array allocators\n - reftable: stop using `BUG()` in trivial cases\n - reftable/record: don't `BUG()` in `reftable_record_cmp()`\n - reftable/record: stop using `BUG()` in `reftable_record_init()`\n - reftable/record: stop using `COPY_ARRAY()`\n - reftable/blocksource: stop using `xmmap()`\n - reftable/stack: stop using `write_in_full()`\n - reftable/stack: stop using `read_in_full()`\n (this branch is used by ps/reftable-windows-unlink-fix.)\n\n Make the code in reftable library less reliant on the service\n routines it used to borrow from Git proper, to make it easier to\n use by external users of the library.\n\n Waiting for Acks, especially for Windows bits?\n source: <20250218-pks-reftable-drop-git-compat-util-v6-0-8c1f39fb4c02@pks.im>\n\n\n* sj/ref-consistency-checks-more (2025-02-27) 9 commits\n (merged to 'next' on 2025-03-05 at 6bea9376c4)\n + builtin/fsck: add `git refs verify` child process\n + packed-backend: check whether the \"packed-refs\" is sorted\n + packed-backend: add \"packed-refs\" entry consistency check\n + packed-backend: check whether the refname contains NUL characters\n + packed-backend: add \"packed-refs\" header consistency check\n + packed-backend: check if header starts with \"# pack-refs with: \"\n + packed-backend: check whether the \"packed-refs\" is regular file\n + builtin/refs: get worktrees without reading head information\n + t0602: use subshell to ensure working directory unchanged\n\n \"git fsck\" becomes more careful when checking the refs.\n\n Will cook in 'next'.\n source: \n\n\n* jc/doc-attr-tree (2024-12-14) 1 commit\n - doc: give attr.tree a bit more visibility\n\n Make sure that \"git --attr-source=X\", GIT_ATTR_SOURCE, and\n attr.tree configuration variables appear at the same places in the\n documentation.\n\n On hold.\n cf. <20241216111112.GA2201417@coredump.intra.peff.net>\n source: \n\n\n* tb/incremental-midx-part-2 (2024-11-20) 15 commits\n - midx: implement writing incremental MIDX bitmaps\n - pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators\n - pack-bitmap.c: keep track of each layer's type bitmaps\n - ewah: implement `struct ewah_or_iterator`\n - pack-bitmap.c: apply pseudo-merge commits with incremental MIDXs\n - pack-bitmap.c: compute disk-usage with incremental MIDXs\n - pack-bitmap.c: teach `rev-list --test-bitmap` about incremental MIDXs\n - pack-bitmap.c: support bitmap pack-reuse with incremental MIDXs\n - pack-bitmap.c: teach `show_objects_for_type()` about incremental MIDXs\n - pack-bitmap.c: teach `bitmap_for_commit()` about incremental MIDXs\n - pack-bitmap.c: open and store incremental bitmap layers\n - pack-revindex: prepare for incremental MIDX bitmaps\n - Documentation: describe incremental MIDX bitmaps\n - Merge branch 'tb/pseudo-merge-bitmap-fixes' into tb/incremental-midx-part-2\n - Merge branch 'tb/incremental-midx-part-1' into tb/incremental-midx-part-2\n\n Incrementally updating multi-pack index files.\n\n Expecting a (hopefully minor and final) reroll.\n cf. \n source: \n\n\n* ej/cat-file-remote-object-info (2025-02-24) 8 commits\n - cat-file: add remote-object-info to batch-command\n - transport: add client support for object-info\n - serve: advertise object-info feature\n - fetch-pack: move fetch initialization\n - fetch-pack: refactor packet writing\n - t1006: split test utility functions into new \"lib-cat-file.sh\"\n - cat-file: add declaration of variable i inside its for loop\n - git-compat-util: add strtoul_ul() with error handling\n\n \"git cat-file --batch\" and friends can optionally ask a remote\n server about objects it does not have.\n source: <20250221190451.12536-1-eric.peijian@gmail.com>\n"},{"id":"514290","messageId":"20250314184130.GA578421@coredump.intra.peff.net","threadId":"63120","inReplyTo":"xmqqv7sbfra0.fsf@gitster.g","subject":"Re: What's cooking in git.git (Mar 2025, #04; Fri, 14)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2025-03-14T18:41:30Z","receivedAt":"2025-03-14T18:41:32Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Mar 14, 2025 at 10:36:39AM -0700, Junio C Hamano wrote:\n\n> * ps/ci-meson-check-build-docs (2025-03-12) 1 commit\n> - ci: perform build and smoke tests for Meson docs\n> \n> CI update.\n> \n> Will merge to 'next'.\n> source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>\n\nI didn't dig into it, but I'd imagine this topic is the source of CI\nfailures on the \"documentation\" job like this:\n\n 2025-03-14T17:50:13.8749066Z + meson setup build-asciidoc -Ddocs=html,man -Ddocs_backend=asciidoc\n 2025-03-14T17:50:13.8752287Z ci/test-documentation.sh: line 50: meson: command not found\n 2025-03-14T17:50:13.8769502Z ##[error]Process completed with exit code 127.\n\nthat I'm seeing in jch (and looks like you have a similar one in the\nlatest build of 'seen')\n\n-Peff\n"},{"id":"514291","messageId":"20250314184219.GA578880@coredump.intra.peff.net","threadId":"63120","inReplyTo":"20250314184130.GA578421@coredump.intra.peff.net","subject":"Re: What's cooking in git.git (Mar 2025, #04; Fri, 14)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2025-03-14T18:42:19Z","receivedAt":"2025-03-14T18:42:20Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Mar 14, 2025 at 02:41:31PM -0400, Jeff King wrote:\n\n> On Fri, Mar 14, 2025 at 10:36:39AM -0700, Junio C Hamano wrote:\n> \n> > * ps/ci-meson-check-build-docs (2025-03-12) 1 commit\n> > - ci: perform build and smoke tests for Meson docs\n> > \n> > CI update.\n> > \n> > Will merge to 'next'.\n> > source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>\n> \n> I didn't dig into it, but I'd imagine this topic is the source of CI\n> failures on the \"documentation\" job like this:\n> \n> 2025-03-14T17:50:13.8749066Z + meson setup build-asciidoc -Ddocs=html,man -Ddocs_backend=asciidoc\n> 2025-03-14T17:50:13.8752287Z ci/test-documentation.sh: line 50: meson: command not found\n> 2025-03-14T17:50:13.8769502Z ##[error]Process completed with exit code 127.\n> \n> that I'm seeing in jch (and looks like you have a similar one in the\n> latest build of 'seen')\n\nSorry, I meant to cc Patrick on this.\n\n-Peff\n"},{"id":"514332","messageId":"xmqqy0x7cg9h.fsf@gitster.g","threadId":"63120","inReplyTo":"20250314184130.GA578421@coredump.intra.peff.net","subject":"Re: What's cooking in git.git (Mar 2025, #04; Fri, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-15T00:02:50Z","receivedAt":"2025-03-15T00:02:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Fri, Mar 14, 2025 at 10:36:39AM -0700, Junio C Hamano wrote:\n>\n>> * ps/ci-meson-check-build-docs (2025-03-12) 1 commit\n>> - ci: perform build and smoke tests for Meson docs\n>> \n>> CI update.\n>> \n>> Will merge to 'next'.\n>> source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>\n>\n> I didn't dig into it, but I'd imagine this topic is the source of CI\n> failures on the \"documentation\" job like this:\n>\n> 2025-03-14T17:50:13.8749066Z + meson setup build-asciidoc -Ddocs=html,man -Ddocs_backend=asciidoc\n> 2025-03-14T17:50:13.8752287Z ci/test-documentation.sh: line 50: meson: command not found\n> 2025-03-14T17:50:13.8769502Z ##[error]Process completed with exit code 127.\n>\n> that I'm seeing in jch (and looks like you have a similar one in the\n> latest build of 'seen')\n>\n> -Peff\n\nSomebody more clueful than me about how the CI dependency set-up is\nsupposed to happen should rewrite the proposed log message\naltogether. The install-dependencies script pretends as if two\ncase..esac blocks are orthogonal (the former switches on $distro,\nthe latter that we see in the patch switches on $jobname), but I\nsomehow do not get the feeling that we can move Documentation job\nfrom ubuntu-latest to alpine-latest for example.\n\nIn any case, the change seems to \"fix\" the issue for me\n\n(bad)\nhttps://github.com/git/git/actions/runs/13867157977/job/38808418127\n\n(good)\nhttps://github.com/git/git/actions/runs/13867208725/job/38808554478\n\n\nThanks.\n\n--- >8 ---\nSubject: [PATCH] install meson for Documentation job\n\nWhy should we even do this? Doesn't it run on ubuntu-latest which\nhas its own apt--get install for meson in the $distro specific\nset-up before this part?\n\n\n---\n ci/install-dependencies.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh\nindex 0df74610d0..fdeeaabaca 100755\n--- a/ci/install-dependencies.sh\n+++ b/ci/install-dependencies.sh\n@@ -123,7 +123,7 @@ sparse)\n \t;;\n Documentation)\n \tsudo apt-get -q update\n-\tsudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make\n+\tsudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make meson\n \n \ttest -n \"$ALREADY_HAVE_ASCIIDOCTOR\" ||\n \tsudo gem install --version 1.5.8 asciidoctor\n-- \n2.49.0-205-gbb947d5b2d\n\n"},{"id":"514333","messageId":"CABPp-BFZkiJgdMqTJCxAMkbA7c_S8Qx3aSRqiLAfqrY1Y3es2w@mail.gmail.com","threadId":"63120","inReplyTo":"xmqqv7sbfra0.fsf@gitster.g","subject":"en/diff-rename-follow-fix (Was: Re: What's cooking in git.git (Mar 2025, #04; Fri, 14))","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2025-03-15T00:32:59Z","receivedAt":"2025-03-15T00:33:11Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Fri, Mar 14, 2025 at 10:42 AM Junio C Hamano wrote:\n>\n[...]\n> * en/diff-rename-follow-fix (2025-03-13) 1 commit\n> - diffcore-rename: fix BUG when break detection and --follow used together\n>\n> A corner-case bug in \"git log --follow -B\" has been fixed.\n>\n> Will merge to 'next'.\n> source: \n\nThanks, but due to Peff's further questioning I dug a lot harder and\nfound another testcase that perhaps helps explain the issue a bit\nmore. I added it and added a little bit more info to the commit\nmessage to try to help answer his questions. Could you wait to merge\nuntil I send out v2?\n"},{"id":"514335","messageId":"xmqqtt7vcckk.fsf@gitster.g","threadId":"63120","inReplyTo":"CABPp-BFZkiJgdMqTJCxAMkbA7c_S8Qx3aSRqiLAfqrY1Y3es2w@mail.gmail.com","subject":"Re: en/diff-rename-follow-fix","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-15T01:22:35Z","receivedAt":"2025-03-15T01:22:41Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Elijah Newren writes:\n\n> message to try to help answer his questions. Could you wait to merge\n> until I send out v2?\n\nThanks for stopping me. No problem.\n"},{"id":"514533","messageId":"xmqqmsdi49h8.fsf_-_@gitster.g","threadId":"63120","inReplyTo":"xmqqy0x7cg9h.fsf@gitster.g","subject":"[PATCH] install meson for Documentation job","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-18T15:57:55Z","receivedAt":"2025-03-18T15:57:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Jeff King writes:\n>\n>> On Fri, Mar 14, 2025 at 10:36:39AM -0700, Junio C Hamano wrote:\n>>\n>>> * ps/ci-meson-check-build-docs (2025-03-12) 1 commit\n>>> - ci: perform build and smoke tests for Meson docs\n>>> \n>>> CI update.\n>>> \n>>> Will merge to 'next'.\n>>> source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>\n>>\n>> I didn't dig into it, but I'd imagine this topic is the source of CI\n>> failures on the \"documentation\" job like this:\n>>\n>> 2025-03-14T17:50:13.8749066Z + meson setup build-asciidoc -Ddocs=html,man -Ddocs_backend=asciidoc\n>> 2025-03-14T17:50:13.8752287Z ci/test-documentation.sh: line 50: meson: command not found\n>> 2025-03-14T17:50:13.8769502Z ##[error]Process completed with exit code 127.\n>>\n>> that I'm seeing in jch (and looks like you have a similar one in the\n>> latest build of 'seen')\n>>\n>> -Peff\n>\n> Somebody more clueful than me about how the CI dependency set-up is\n> supposed to happen should rewrite the proposed log message\n> altogether. The install-dependencies script pretends as if two\n> case..esac blocks are orthogonal (the former switches on $distro,\n> the latter that we see in the patch switches on $jobname), but I\n> somehow do not get the feeling that we can move Documentation job\n> from ubuntu-latest to alpine-latest for example.\n\nPing? Anybody wants to help explain how this part of CI works to\nthe commit log message?\n\n> In any case, the change seems to \"fix\" the issue for me\n>\n> (bad)\n> https://github.com/git/git/actions/runs/13867157977/job/38808418127\n>\n> (good)\n> https://github.com/git/git/actions/runs/13867208725/job/38808554478\n>\n>\n> Thanks.\n>\n> --- >8 ---\n> Subject: [PATCH] install meson for Documentation job\n>\n> Why should we even do this? Doesn't it run on ubuntu-latest which\n> has its own apt--get install for meson in the $distro specific\n> set-up before this part?\n>\n>\n> ---\n> ci/install-dependencies.sh | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh\n> index 0df74610d0..fdeeaabaca 100755\n> --- a/ci/install-dependencies.sh\n> +++ b/ci/install-dependencies.sh\n> @@ -123,7 +123,7 @@ sparse)\n> \t;;\n> Documentation)\n> \tsudo apt-get -q update\n> -\tsudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make\n> +\tsudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make meson\n> \n> \ttest -n \"$ALREADY_HAVE_ASCIIDOCTOR\" ||\n> \tsudo gem install --version 1.5.8 asciidoctor\n"},{"id":"514534","messageId":"CAOLa=ZRODjYfDXQ8m+hDosV7RBGDWeehzSvsR-+-HCmbS+tAcQ@mail.gmail.com","threadId":"63120","inReplyTo":"xmqqmsdi49h8.fsf_-_@gitster.g","subject":"Re: [PATCH] install meson for Documentation job","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-03-18T16:19:31Z","receivedAt":"2025-03-18T16:19:33Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Junio C Hamano writes:\n\n> Junio C Hamano writes:\n>\n>> Jeff King writes:\n>>\n>>> On Fri, Mar 14, 2025 at 10:36:39AM -0700, Junio C Hamano wrote:\n>>>\n>>>> * ps/ci-meson-check-build-docs (2025-03-12) 1 commit\n>>>> - ci: perform build and smoke tests for Meson docs\n>>>>\n>>>> CI update.\n>>>>\n>>>> Will merge to 'next'.\n>>>> source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>\n>>>\n>>> I didn't dig into it, but I'd imagine this topic is the source of CI\n>>> failures on the \"documentation\" job like this:\n>>>\n>>> 2025-03-14T17:50:13.8749066Z + meson setup build-asciidoc -Ddocs=html,man -Ddocs_backend=asciidoc\n>>> 2025-03-14T17:50:13.8752287Z ci/test-documentation.sh: line 50: meson: command not found\n>>> 2025-03-14T17:50:13.8769502Z ##[error]Process completed with exit code 127.\n>>>\n>>> that I'm seeing in jch (and looks like you have a similar one in the\n>>> latest build of 'seen')\n>>>\n>>> -Peff\n>>\n>> Somebody more clueful than me about how the CI dependency set-up is\n>> supposed to happen should rewrite the proposed log message\n>> altogether. The install-dependencies script pretends as if two\n>> case..esac blocks are orthogonal (the former switches on $distro,\n>> the latter that we see in the patch switches on $jobname), but I\n>> somehow do not get the feeling that we can move Documentation job\n>> from ubuntu-latest to alpine-latest for example.\n>\n> Ping? Anybody wants to help explain how this part of CI works to\n> the commit log message?\n>\n\nWeird. From the looks of\nhttps://github.com/git/git/actions/runs/13867157977/job/38808418127, it\nseems like the '$distro' variable in 'ci/install-dependencies.sh' is not\nbeing correctly initialized. We can see this in the logs of the CI:\n\n CI setup via install-dependencies.sh\n + set -e\n + export TERM=dumb\n + export MAKEFLAGS=\n + test true = true\n + CI_TYPE=github-actions\n + CI_BRANCH=refs/heads/seen\n + CI_COMMIT=d5389e37e21d864f40f4167280db799ffe8983c2\n + echo Linux\n + tr A-Z a-z\n + CI_OS_NAME=linux\n + test macos != linux\n + CI_REPO_SLUG=git/git\n + CI_JOB_ID=13867157977\n + CC=gcc\n + DONT_SKIP_TAGS=t\n + cache_dir=/home/runner/none\n + GIT_TEST_OPTS=--github-workflow-markup\n + JOBS=10\n + echo\n + tr : -\n + distro=\n ...\n\nSo in 'ci/lib.sh' we set `distro=$(echo \"$CI_JOB_IMAGE\" | tr : -)`. So\nthis means the distro is based on '$CI_JOB_IMAGE' env variable.\n\nFrom '.github/workflows/main.yml' we can see that this is not set for\nthe 'Documentation' job. I'm not sure why this the way it is though. I\ndidn't look into the history.\n\nAn untested fix, which should fix (is it a bug?) the root cause:\n\n-- 8< --\n\ndiff --git a/.github/workflows/main.yml b/.github/workflows/main.yml\nindex 9959b61ece..2679a32508 100644\n--- a/.github/workflows/main.yml\n+++ b/.github/workflows/main.yml\n@@ -473,6 +473,7 @@ jobs:\n cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent\n== 'yes' }}\n env:\n jobname: Documentation\n+ CI_JOB_IMAGE: ubuntu-latest\n runs-on: ubuntu-latest\n steps:\n - uses: actions/checkout@v4\n\n\n>> In any case, the change seems to \"fix\" the issue for me\n>>\n>> (bad)\n>> https://github.com/git/git/actions/runs/13867157977/job/38808418127\n>>\n>> (good)\n>> https://github.com/git/git/actions/runs/13867208725/job/38808554478\n>>\n>>\n>> Thanks.\n>>\n>> --- >8 ---\n>> Subject: [PATCH] install meson for Documentation job\n>>\n>> Why should we even do this? Doesn't it run on ubuntu-latest which\n>> has its own apt--get install for meson in the $distro specific\n>> set-up before this part?\n>>\n>>\n>> ---\n>> ci/install-dependencies.sh | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh\n>> index 0df74610d0..fdeeaabaca 100755\n>> --- a/ci/install-dependencies.sh\n>> +++ b/ci/install-dependencies.sh\n>> @@ -123,7 +123,7 @@ sparse)\n>> \t;;\n>> Documentation)\n>> \tsudo apt-get -q update\n>> -\tsudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make\n>> +\tsudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make meson\n>>\n>> \ttest -n \"$ALREADY_HAVE_ASCIIDOCTOR\" ||\n>> \tsudo gem install --version 1.5.8 asciidoctor\n"},{"id":"514551","messageId":"xmqqiko613a0.fsf@gitster.g","threadId":"63120","inReplyTo":"CAOLa=ZRODjYfDXQ8m+hDosV7RBGDWeehzSvsR-+-HCmbS+tAcQ@mail.gmail.com","subject":"Re: [PATCH] install meson for Documentation job","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-18T20:40:07Z","receivedAt":"2025-03-18T20:40:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karthik Nayak writes:\n\n> Weird. From the looks of\n> https://github.com/git/git/actions/runs/13867157977/job/38808418127, it\n> seems like the '$distro' variable in 'ci/install-dependencies.sh' is not\n> being correctly initialized. We can see this in the logs of the CI:\n>\n> CI setup via install-dependencies.sh\n> + set -e\n> + export TERM=dumb\n> + export MAKEFLAGS=\n> + test true = true\n> + CI_TYPE=github-actions\n> + CI_BRANCH=refs/heads/seen\n> + CI_COMMIT=d5389e37e21d864f40f4167280db799ffe8983c2\n> + echo Linux\n> + tr A-Z a-z\n> + CI_OS_NAME=linux\n> + test macos != linux\n> + CI_REPO_SLUG=git/git\n> + CI_JOB_ID=13867157977\n> + CC=gcc\n> + DONT_SKIP_TAGS=t\n> + cache_dir=/home/runner/none\n> + GIT_TEST_OPTS=--github-workflow-markup\n> + JOBS=10\n> + echo\n> + tr : -\n> + distro=\n> ...\n\nNice digging.\n\n> So in 'ci/lib.sh' we set `distro=$(echo \"$CI_JOB_IMAGE\" | tr : -)`. So\n> this means the distro is based on '$CI_JOB_IMAGE' env variable.\n>\n> From '.github/workflows/main.yml' we can see that this is not set for\n> the 'Documentation' job. I'm not sure why this the way it is though. I\n> didn't look into the history.\n"},{"id":"514625","messageId":"Z9qNNq0p10YJCZYo@pks.im","threadId":"63120","inReplyTo":"xmqqiko613a0.fsf@gitster.g","subject":"Re: [PATCH] install meson for Documentation job","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2025-03-19T09:24:06Z","receivedAt":"2025-03-19T09:24:14Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Tue, Mar 18, 2025 at 01:40:07PM -0700, Junio C Hamano wrote:\n> Karthik Nayak writes:\n> \n> > Weird. From the looks of\n> > https://github.com/git/git/actions/runs/13867157977/job/38808418127, it\n> > seems like the '$distro' variable in 'ci/install-dependencies.sh' is not\n> > being correctly initialized. We can see this in the logs of the CI:\n> >\n> > CI setup via install-dependencies.sh\n> > + set -e\n> > + export TERM=dumb\n> > + export MAKEFLAGS=\n> > + test true = true\n> > + CI_TYPE=github-actions\n> > + CI_BRANCH=refs/heads/seen\n> > + CI_COMMIT=d5389e37e21d864f40f4167280db799ffe8983c2\n> > + echo Linux\n> > + tr A-Z a-z\n> > + CI_OS_NAME=linux\n> > + test macos != linux\n> > + CI_REPO_SLUG=git/git\n> > + CI_JOB_ID=13867157977\n> > + CC=gcc\n> > + DONT_SKIP_TAGS=t\n> > + cache_dir=/home/runner/none\n> > + GIT_TEST_OPTS=--github-workflow-markup\n> > + JOBS=10\n> > + echo\n> > + tr : -\n> > + distro=\n> > ...\n> \n> Nice digging.\n\nThanks all for discovering and debugging this, I somehow missed this\nthread and haven't been able to keep up with the mailing list for the\nlast couple days.\n\nI see 4451a164e5a (install meson for Documentation job, 2025-03-14) has\nbeen merged, but as far as I understand we also have to take Karthik's\npatch to fix installing dependencies? In case I'm correct, do you plan\nto send this as a proper patch, Karthik?\n\nPatrick\n"},{"id":"514661","messageId":"CAOLa=ZQHZEh=vzxUqBLmVDn3LWFrch0BtRAYMssLO9hL9a5sJg@mail.gmail.com","threadId":"63120","inReplyTo":"Z9qNNq0p10YJCZYo@pks.im","subject":"Re: [PATCH] install meson for Documentation job","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-03-19T16:22:35Z","receivedAt":"2025-03-19T16:22:38Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Patrick Steinhardt writes:\n\n> On Tue, Mar 18, 2025 at 01:40:07PM -0700, Junio C Hamano wrote:\n>> Karthik Nayak writes:\n>>\n>> > Weird. From the looks of\n>> > https://github.com/git/git/actions/runs/13867157977/job/38808418127, it\n>> > seems like the '$distro' variable in 'ci/install-dependencies.sh' is not\n>> > being correctly initialized. We can see this in the logs of the CI:\n>> >\n>> > CI setup via install-dependencies.sh\n>> > + set -e\n>> > + export TERM=dumb\n>> > + export MAKEFLAGS=\n>> > + test true = true\n>> > + CI_TYPE=github-actions\n>> > + CI_BRANCH=refs/heads/seen\n>> > + CI_COMMIT=d5389e37e21d864f40f4167280db799ffe8983c2\n>> > + echo Linux\n>> > + tr A-Z a-z\n>> > + CI_OS_NAME=linux\n>> > + test macos != linux\n>> > + CI_REPO_SLUG=git/git\n>> > + CI_JOB_ID=13867157977\n>> > + CC=gcc\n>> > + DONT_SKIP_TAGS=t\n>> > + cache_dir=/home/runner/none\n>> > + GIT_TEST_OPTS=--github-workflow-markup\n>> > + JOBS=10\n>> > + echo\n>> > + tr : -\n>> > + distro=\n>> > ...\n>>\n>> Nice digging.\n>\n> Thanks all for discovering and debugging this, I somehow missed this\n> thread and haven't been able to keep up with the mailing list for the\n> last couple days.\n>\n> I see 4451a164e5a (install meson for Documentation job, 2025-03-14) has\n> been merged, but as far as I understand we also have to take Karthik's\n> patch to fix installing dependencies? In case I'm correct, do you plan\n> to send this as a proper patch, Karthik?\n>\n\nI had a patch locally and after your mail, I did test it out on GitHub\n[1]. Will send it here, this should fix the issue and replace\n4451a164e5a.\n\n[1]: https://github.com/git/git/actions/runs/13944424140/job/39028258830?pr=1927\n\n> Patrick\n"},{"id":"514666","messageId":"20250319163328.525284-1-karthik.188@gmail.com","threadId":"63120","inReplyTo":"Z9qNNq0p10YJCZYo@pks.im","subject":"[PATCH] ci/github: add missing 'CI_JOB_IMAGE' env variable","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-03-19T16:33:28Z","receivedAt":"2025-03-19T16:33:34Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"The CI setups of GitLab and GitHub use a common dependency management\nscript 'ci/install-dependencies.sh'. The script install the necessary\npackages based on a combination of the \"$distro\" and \"$jobname\" env\nvariables.\n\nThe \"$distro\" variable is derived from the \"CI_JOB_IMAGE\" env variable\nset by the CI configs. In the GitHub CI config, some of the jobs are\nmissing this variable. For the 'Documentation' job which depends on\n'meson' being installed, this raises an error since the 'meson'\ndependency is never installed.\n\nFix this by adding the 'CI_JOB_IMAGE' variable to all missing jobs. We\ndon't add it the windows jobs, since they manager their dependency as\npart of the CI config and no further dependency management is needed.\n\nSigned-off-by: Karthik Nayak \n---\n\nJunio, not sure if you wanted a patch here, since you already had a fix\nyourself. But I'm providing one nonetheless, feel free to drop it.\n\n .github/workflows/main.yml | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/.github/workflows/main.yml b/.github/workflows/main.yml\nindex 9959b61ece..37541f3d10 100644\n--- a/.github/workflows/main.yml\n+++ b/.github/workflows/main.yml\n@@ -349,6 +349,7 @@ jobs:\n if: needs.ci-config.outputs.enabled == 'yes'\n env:\n CC: clang\n+ CI_JOB_IMAGE: ubuntu-latest\n runs-on: ubuntu-latest\n steps:\n - uses: actions/checkout@v4\n@@ -432,6 +433,7 @@ jobs:\n if: needs.ci-config.outputs.enabled == 'yes'\n env:\n jobname: StaticAnalysis\n+ CI_JOB_IMAGE: ubuntu-22.04\n runs-on: ubuntu-22.04\n concurrency:\n group: static-analysis-${{ github.ref }}\n@@ -446,6 +448,7 @@ jobs:\n if: needs.ci-config.outputs.enabled == 'yes'\n env:\n jobname: sparse\n+ CI_JOB_IMAGE: ubuntu-20.04\n runs-on: ubuntu-20.04\n concurrency:\n group: sparse-${{ github.ref }}\n@@ -473,6 +476,7 @@ jobs:\n cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}\n env:\n jobname: Documentation\n+ CI_JOB_IMAGE: ubuntu-latest\n runs-on: ubuntu-latest\n steps:\n - uses: actions/checkout@v4\n-- \n2.48.1\n\n"},{"id":"514717","messageId":"Z9u_UlxCDPFlOubZ@pks.im","threadId":"63120","inReplyTo":"20250319163328.525284-1-karthik.188@gmail.com","subject":"Re: [PATCH] ci/github: add missing 'CI_JOB_IMAGE' env variable","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2025-03-20T07:10:10Z","receivedAt":"2025-03-20T07:10:20Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Wed, Mar 19, 2025 at 05:33:28PM +0100, Karthik Nayak wrote:\n> The CI setups of GitLab and GitHub use a common dependency management\n> script 'ci/install-dependencies.sh'. The script install the necessary\n> packages based on a combination of the \"$distro\" and \"$jobname\" env\n> variables.\n> \n> The \"$distro\" variable is derived from the \"CI_JOB_IMAGE\" env variable\n> set by the CI configs. In the GitHub CI config, some of the jobs are\n> missing this variable. For the 'Documentation' job which depends on\n> 'meson' being installed, this raises an error since the 'meson'\n> dependency is never installed.\n> \n> Fix this by adding the 'CI_JOB_IMAGE' variable to all missing jobs. We\n> don't add it the windows jobs, since they manager their dependency as\n> part of the CI config and no further dependency management is needed.\n\nMakes sense. We didn't install Meson beforehand because we accidentally\ndidn't install any of the base dependencies. This is fixed by setting\nthe expected environment variable, and that already pulls in Meson for\nus.\n\nI think this fix is preferable over Junio's fix that manually installs\nMeson as it fixes the root cause and because it's more robust going\nforward in case we ever happen to pull in any additional dependencies.\n\nThanks!\n\nPatrick\n"},{"id":"514810","messageId":"xmqqv7s3xxbd.fsf@gitster.g","threadId":"63120","inReplyTo":"Z9qNNq0p10YJCZYo@pks.im","subject":"Re: [PATCH] install meson for Documentation job","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-20T20:27:02Z","receivedAt":"2025-03-20T20:27:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Patrick Steinhardt writes:\n\n> I see 4451a164e5a (install meson for Documentation job, 2025-03-14) has\n> been merged, but as far as I understand we also have to take Karthik's\n> patch to fix installing dependencies? In case I'm correct, do you plan\n> to send this as a proper patch, Karthik?\n\nYes, once the Karthik's discovery is properly fixed, 4451a164\n(install meson for Documentation job, 2025-03-14), which is a\nmisguided attempt to work around the symptom, should be discarded.\n\n"},{"id":"514824","messageId":"xmqqsen6vn1q.fsf@gitster.g","threadId":"63120","inReplyTo":"20250319163328.525284-1-karthik.188@gmail.com","subject":"Re: [PATCH] ci/github: add missing 'CI_JOB_IMAGE' env variable","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-21T07:51:45Z","receivedAt":"2025-03-21T07:51:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karthik Nayak writes:\n\n> The CI setups of GitLab and GitHub use a common dependency management\n> script 'ci/install-dependencies.sh'. The script install the necessary\n> packages based on a combination of the \"$distro\" and \"$jobname\" env\n> variables.\n\nIt seems that CI_JOB_IMAGE is a GitLab invention that is defined\nautomatically for all CI/CD jobs?\n\nThe range of values for the variable seems to be names of Docker\nimages, so presumably they mean the same thing when used in GitHub\nActions environment? I am just idly wondering if ci/*.sh scripts\nrunning in GitLab CI/CD says \"Ah, we are using ubuntu-latest image\"\nand does one thing, if it is always safe and sensible to do the same\nthing in GitHub Actions environment when CI_JOB_IMAGE is set to the\nsame 'ubuntu-latest' value in this workflows/main.yml file for the\njob (otherwise our desire to share as much as possible becomes\nharder to achieve).\n\n> The \"$distro\" variable is derived from the \"CI_JOB_IMAGE\" env variable\n> set by the CI configs. In the GitHub CI config, some of the jobs are\n> missing this variable. For the 'Documentation' job which depends on\n> 'meson' being installed, this raises an error since the 'meson'\n> dependency is never installed.\n>\n> Fix this by adding the 'CI_JOB_IMAGE' variable to all missing jobs. We\n> don't add it the windows jobs, since they manager their dependency as\n> part of the CI config and no further dependency management is needed.\n>\n> Signed-off-by: Karthik Nayak \n> ---\n>\n> Junio, not sure if you wanted a patch here, since you already had a fix\n> yourself. But I'm providing one nonetheless, feel free to drop it.\n\nGood. The one I did was an attempt to blindly sweep the issue under\nthe rug by patching merely one thing, and I consider that this patch\nis the true fix for the root issue, so the other one can be reverted\nout of 'next' (or removed from 'next' when it is rebuilt).\n\nThanks, will queue.\n"}]}