fix: replace isomorphic-git status with direct git diff for worktree support #1706
+2
−7
Conversation
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
…support Replace complex isomorphic-git status detection with direct git diff command to properly handle git worktrees. fix
64f40b8 to
a8f8bf2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Replace complex isomorphic-git status detection with direct git diff command to properly handle git worktrees.
At first, I tried detecting the git root dir using
git rev-parse --git-dirand passing it as thegitDirarg toisomorphic-gitBut
git.status()returned incorrect status.I saw that
packages/opencode/src/file/index.tsalready uses directgitcommands in thestatusfunction,so I updated the read function to do the same.
the
git diffcommand works correctly in worktreesBefore:
After:
Closes #891