fix: snapshot history when running from git worktrees#4312
Merged
Conversation
Pass --work-tree on all snapshot git invocations to respect the active worktree while preserving shared history.\n\nAdd tests for worktree flows (patch, revert, diff) and align test conventions: move helper near bootstrap, rename tests for clarity, and clean worktree teardown with `git worktree remove --force`. No storage/layout changes.
Collaborator
|
Great fix thank you |
xywsxp
pushed a commit
to xywsxp/opencode
that referenced
this pull request
Apr 24, 2026
Rwanbt
pushed a commit
to Rwanbt/opencode
that referenced
this pull request
May 5, 2026
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.
When running from a secondary git worktree, snapshot history stops updating. The sidecar snapshot repo under
~/.local/share/opencode/snapshot/<project-id>retains the original worktree path incore.worktreefrom the first initialization. Subsequent sessions reuse the same snapshot repo but do not override the worktree, so git add/diff/revert operate against the wrong tree. In the TUI, the Modified Files section remains hidden on the sidebar, and undo/redo don’t affect any files in the active worktree.This patch passes the active worktree to every snapshot git invocation by adding
--work-treealongside the existing--git-dir. Storage layout and initialization stay the same, no migrations or config changes.Validated locally with v1.0.65 by setting
GIT_WORK_TREEto the active worktree. This patch implements the same behavior in code.Tests cover three worktree scenarios: