On Mon, Feb 24, 2025 at 06:47:23PM -0800, Junio C Hamano wrote: > * ps/meson-contrib-bits (2025-02-20) 10 commits > - ci: exercise credential helpers > - ci: fix propagating UTF-8 test locale in musl-based Meson job > - meson: wire up static analysis via Coccinelle > - meson: wire up git-contacts(1) > - meson: wire up credential helpers > - contrib/credential: fix compilation of "osxkeychain" helper > - contrib/credential: fix compiling "libsecret" helper > - contrib/credential: fix compilation of wincred helper with MSVC > - contrib/credential: fix "netrc" tests with out-of-tree builds > - GIT-BUILD-OPTIONS: propagate project's source directory > > Update meson-based build procedure to cover contrib/ and other > places as well. > > Expecting a reroll. > source: <20250218-b4-pks-meson-contrib-v1-0-c3edd292beb8@xxxxxx> v2 of this patch series hasn't yet received any comments that require a reroll, unless I've missed something. > * ps/path-sans-the-repository (2025-02-24) 17 commits > - fixup! rerere: let `rerere_path()` write paths into a caller-provided buffer > - path: adjust last remaining users of `the_repository` > - environment: move access to "core.sharedRepository" into repo settings > - environment: move access to "core.hooksPath" into repo settings > - repo-settings: introduce function to clear struct > - path: drop `git_path()` in favor of `repo_git_path()` > - rerere: let `rerere_path()` write paths into a caller-provided buffer > - path: drop `git_common_path()` in favor of `repo_common_path()` > - worktree: return allocated string from `get_worktree_git_dir()` > - path: drop `git_path_buf()` in favor of `repo_git_path_replace()` > - path: drop `git_pathdup()` in favor of `repo_git_path()` > - path: drop unused `strbuf_git_path()` function > - path: refactor `repo_submodule_path()` family of functions > - submodule: refactor `submodule_to_gitdir()` to accept a repo > - path: refactor `repo_worktree_path()` family of functions > - path: refactor `repo_git_path()` family of functions > - path: refactor `repo_common_path()` family of functions > > The path.[ch] API takes an explicit repository parameter passed > throughout the callchain, instead of relying on the_repository > singleton instance. > > Will merge to 'next'? > source: <20250207-b4-pks-path-drop-the-repository-v2-0-13cad3c11b8a@xxxxxx> The fixup commit looks good to me, so I'll refrain from sending a v3 only to roll the fix into the series. > * pw/rebase-i-ff-empty-commit (2025-02-11) 1 commit > - rebase -i: reword empty commit after fast-forward > > "git rebase -i" failed to allow rewording an empty commit that has > been fast-forwarded. > > Will merge to 'next'? > source: <pull.1860.v2.git.1739289549299.gitgitgadget@xxxxxxxxx> I had a quick read of this patch and didn't have anything to say on it, so I think it should be ready for next. > * sj/ref-consistency-checks-more (2025-02-13) 8 commits > - builtin/fsck: add `git refs verify` child process > - packed-backend: check whether the "packed-refs" is sorted > - packed-backend: add "packed-refs" entry consistency check > - packed-backend: check whether the refname contains NUL characters > - packed-backend: add "packed-refs" header consistency check > - packed-backend: check whether the "packed-refs" is regular file > - builtin/refs: get worktrees without reading head information > - t0602: use subshell to ensure working directory unchanged > > "git fsck" becomes more careful when checking the refs. > > Comments? > source: <Z67LkxAFIAeaYr0U@ArchLinux> I'll make sure to give this series another read today. Patrick