On Thu Nov 28, 2024 at 8:44 AM CST, Phillip Wood wrote: > On 26/11/2024 01:51, Caleb White wrote: >> Changes in v5: >> - Added docs to `--relative-paths` option. >> - Added test coverage for `repair_worktrees()` and relative paths. >> - Move `strbuf_reset` call in `infer_backlink()`. >> - Cleaned up tests. >> - Slight stylistic changes. >> - Tweaked commit messages. >> - Updated base to 090d24e9af. > > Thanks for re-rolling, these changes sound good. Below is the > range-diff of what is in seen today compared to last week. I've left > it untrimmed so other people can check what's changed and I've added a > couple of comments. The only thing I'm worried about is the deletion > of a check for setting extensions.relativeWorktrees in patch 5 the > rest of the changes look good, thank you for the extra test checks and > log messages. > > @@ t/t2400-worktree-add.sh: test_expect_success '"add" with initialized submodule, > + git init repo && > + git -C repo commit --allow-empty -m base && > + git -C repo worktree add --relative-paths ./foo && > -+ git -C repo config get core.repositoryformatversion >actual && > -+ echo 1 >expected && > -+ test_cmp expected actual && > -+ git -C repo config get extensions.relativeworktrees >actual && > -+ echo true >expected && > -+ test_cmp expected actual > ++ test_cmp_config -C repo 1 core.repositoryformatversion > +' > > We have lost the check for extensions.relativeworktrees > here. Although we don't set worktree.useRelativePaths anymore we > should still set the extension as we pase --relative-paths to "git > worktree add" Good catch! This was removed unintentionally. I'll add this back in, but will hold off on re-rolling until we're ready for the final re-roll (or there's other changes requested). Best, Caleb
