Skip to content

fix(test): handle non-git CWD in current_or_recover test #2633

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

Closed
worktrunk-bot wants to merge 2 commits into from
Closed

fix(test): handle non-git CWD in current_or_recover test #2633

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5b3546
fix(test): handle non-git CWD in current_or_recover test
worktrunk-bot May 7, 2026
5a39bc4
refactor(test): collapse non-git-repo guard to let-else
worktrunk-bot May 7, 2026
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
9 changes: 6 additions & 3 deletions src/git/recover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,12 @@ mod tests {

#[test]
fn test_current_or_recover_returns_repo_when_cwd_exists() {
// In a test environment, CWD exists, so current_or_recover should succeed
// via the normal Repository::current() path (not recovery).
// Tests run inside a git repo in CI, so Repository::current() succeeds.
// current_or_recover() reads the process CWD via Repository::current().
// When tests run outside any git repo — e.g. the Nix flake build
// sandbox, where pkgs.lib.cleanSource strips .git (#2632) — the
// success branch can't be exercised, and recovery has nothing to
// recover from either, so the function returns Err.
let Ok(_) = Repository::current() else { return };
let (repo, recovered) = current_or_recover().unwrap();
assert!(!recovered);
assert!(repo.repo_path().unwrap().exists());
Expand Down
Loading