Skip to content

fix(tests): canonicalize the temp repo path in the integration helper #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
helizaga merged 1 commit into from
Sep 15, 2026
+7 −1
Merged

fix(tests): canonicalize the temp repo path in the integration helper #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this

## [Unreleased]

### Fixed

- The integration test helper now canonicalizes its temporary repository path. On macOS `mktemp -d` returns a `/var` path while git records the resolved `/private/var` one, so `cmd_clean --merged uses nested registered worktree path` compared two spellings of the same directory and failed locally while passing in CI.

## [2.11.1] - 2026-09-14

### Changed
Expand Down
4 changes: 3 additions & 1 deletion tests/test_helper.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ export -f cfg_default cfg_get_all
# Set up a disposable git repo for integration tests
# Sets: TEST_REPO, TEST_WORKTREES_DIR
setup_integration_repo() {
TEST_REPO=$(mktemp -d)
# Canonicalize: on macOS mktemp -d returns a /var path while git records the
# resolved /private/var one, so uncanonicalized paths never compare equal.
TEST_REPO=$(cd -P "$(mktemp -d)" && pwd)
TEST_WORKTREES_DIR="${TEST_REPO}-worktrees"
git -C "$TEST_REPO" init --quiet
git -C "$TEST_REPO" config user.name "Test User"
Expand Down
Loading