hoborg/opencode
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: worktree file/content never includes patch

Browse Source
This commit is contained in:
Adam
2025-09-04 06:09:06 -05:00
parent 85ac243752
commit f7ab6beaf3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/opencode/src/file/index.ts
View File

@@ -124,10 +124,9 @@ export namespace File {
.catch(() => "") .catch(() => "")
.then((x) => x.trim()) .then((x) => x.trim())
if (project.vcs === "git") { if (project.vcs === "git") {
const rel = path.relative(Instance.worktree, full) const diff = await $`git diff ${file}`.cwd(Instance.directory).quiet().nothrow().text()
const diff = await $`git diff ${rel}`.cwd(Instance.worktree).quiet().nothrow().text()
if (diff.trim()) { if (diff.trim()) {
const original = await $`git show HEAD:${rel}`.cwd(Instance.worktree).quiet().nothrow().text() const original = await $`git show HEAD:${file}`.cwd(Instance.directory).quiet().nothrow().text()
const patch = createPatch(file, original, content, "old", "new", { const patch = createPatch(file, original, content, "old", "new", {
context: Infinity, context: Infinity,
}) })