Skip to content

fix(snapshot): seed index from the worktree's git dir #39398

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
Hyyy6 wants to merge 1 commit into from
+7 −1
Closed

fix(snapshot): seed index from the worktree's git dir #39398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion packages/opencode/src/snapshot/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,13 @@ const layer: Layer.Layer<Service, never, FSUtil.Service | AppProcess.Service | C

// Seed the index from the source repo so already-hashed entries are reused.
// Best-effort: a missing/incompatible index just falls back to a full add.
const sourceIndex = path.join(source, "index")
// Resolve the index from the worktree's own git dir (--git-dir), not the
// common dir: in a linked worktree --git-common-dir points at the main
// repo's .git, whose index does not match the worktree's working tree.
const gitdir = yield* git(["rev-parse", "--path-format=absolute", "--git-dir"], {
cwd: state.worktree,
})
const sourceIndex = gitdir.code === 0 ? path.join(gitdir.text.trim(), "index") : path.join(source, "index")
if (yield* exists(sourceIndex)) {
yield* fs.copyFile(sourceIndex, path.join(state.gitdir, "index")).pipe(Effect.catch(() => Effect.void))
}
Expand Down
Loading