fix: use absolute path for git repository discovery in worktrees#123
Merged
agavra merged 1 commit intoagavra:mainfrom Jan 20, 2026
Merged
fix: use absolute path for git repository discovery in worktrees#123agavra merged 1 commit intoagavra:mainfrom
agavra merged 1 commit intoagavra:mainfrom
Conversation
When running inside a git worktree, Repository::discover(".") with a
relative path can cause git2 to resolve paths incorrectly. This resulted
in files appearing as deleted and incorrect diff comparisons.
Using the canonical current working directory ensures git2 properly
follows worktree gitdir references.
Fixes agavra#119
agavra
approved these changes
Jan 20, 2026
Owner
agavra
left a comment
agavra
left a comment
There was a problem hiding this comment.
Nice, thanks for the fix @villads-valur
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Root Cause
Repository::discover(".")with a relative path can cause git2 to resolve paths incorrectly in worktrees, where.gitis a file pointing to the main repo's gitdir.Solution
Use
std::env::current_dir()to get the canonical path before callingRepository::discover(), ensuring git2 properly follows worktree gitdir references.Fixes #119