Skip to content

fix: git worktree handling #4657

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

Draft
veracioux wants to merge 2 commits into
base: dev
Choose a base branch
from
+6 −5
Draft

fix: git worktree handling #4657

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97493e5
fix: git worktree handling
veracioux Nov 23, 2025
1787fee
fix: Extend timer scope
veracioux Nov 23, 2025
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
11 changes: 6 additions & 5 deletions packages/opencode/src/project/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import z from "zod"
import { Filesystem } from "../util/filesystem"
import path from "path"
import { $ } from "bun"
import { Storage } from "../storage/storage"
Expand All @@ -25,9 +24,12 @@ export namespace Project {

export async function fromDirectory(directory: string) {
log.info("fromDirectory", { directory })
const matches = Filesystem.up({ targets: [".git"], start: directory })
const git = await matches.next().then((x) => x.value)
await matches.return()
const timer = log.time("git.rev-parse")
const git = await $`git rev-parse --absolute-git-dir`
.cwd(directory)
.text()
.then((x) => x.trim())
.catch(() => undefined)
if (!git) {
const project: Info = {
id: "global",
Expand All @@ -41,7 +43,6 @@ export namespace Project {
return project
}
let worktree = path.dirname(git)
const timer = log.time("git.rev-parse")
let id = await Bun.file(path.join(git, "opencode"))
.text()
.then((x) => x.trim())
Expand Down
Loading