both #539

New issue

Closed

opened 2026-03-02 04:13:55 +03:00 by kerem · 0 comments

kerem commented

2026-03-02 04:13:55 +03:00

Owner

Original Pull Request: https://github.com/git-ai-project/git-ai/pull/528

State: closed
Merged: No

Summary

Add comprehensive worktree support with test coverage across wrapper/corehooks/both modes.

Depends on: PR #530 (codex/global-hooks-dual-mode)

Changes

Repository worktree handling (src/git/repository.rs): Add worktree-aware path resolution, storage isolation, and commondir handling
Blame parity (src/commands/blame.rs): Fix boundary/abbrev formatting for worktree contexts
26 worktree integration tests (tests/worktrees.rs): Config resolution, stash/reset, checkpoint, blame, diff, rebase, cherry-pick, multi-worktree divergence
worktree_test_wrappers! macro: Automatically runs existing tests in worktree mode across 30+ test files
Worktree snapshots: Expected output for initial_attributions and stats tests
Windows fixes: Path normalization (UNC prefix), CRLF handling, GIT_CONFIG_GLOBAL isolation

Note

CI does not run on this PR because the base branch is not main. CI will run when PR #530 is merged and this PR is retargeted to main, or when the full stack is tested together.

🤖 Generated with Claude Code

**Original Pull Request:** https://github.com/git-ai-project/git-ai/pull/528 **State:** closed **Merged:** No --- ## Summary Add comprehensive worktree support with test coverage across wrapper/corehooks/both modes. **Depends on:** PR #530 (`codex/global-hooks-dual-mode`) ### Changes - **Repository worktree handling** (`src/git/repository.rs`): Add worktree-aware path resolution, storage isolation, and commondir handling - **Blame parity** (`src/commands/blame.rs`): Fix boundary/abbrev formatting for worktree contexts - **26 worktree integration tests** (`tests/worktrees.rs`): Config resolution, stash/reset, checkpoint, blame, diff, rebase, cherry-pick, multi-worktree divergence - **worktree_test_wrappers! macro**: Automatically runs existing tests in worktree mode across 30+ test files - **Worktree snapshots**: Expected output for initial_attributions and stats tests - **Windows fixes**: Path normalization (UNC prefix), CRLF handling, GIT_CONFIG_GLOBAL isolation ### Note CI does not run on this PR because the base branch is not `main`. CI will run when PR #530 is merged and this PR is retargeted to `main`, or when the full stack is tested together. 🤖 Generated with [Claude Code](https://claude.com/claude-code)