skills/backnotprop__plannotator
1
0
Fork 0
mirror of https://github.com/backnotprop/plannotator.git synced 2026-09-14 14:17:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(review): disable external diff in git commands (#320)

Browse Source
This commit is contained in:
insects
2026-03-18 00:17:14 +08:00
committed by GitHub
parent 03390eb2c9
commit f29dbbb1f8
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/pi-extension/review-core.ts
+7 -3
View File
@@ -188,6 +188,7 @@ async function getUntrackedFileDiffs(
const diffResult = await runtime.runGit(
[
"diff",
"--no-ext-diff",
"--no-index",
`--src-prefix=${srcPrefix}`,
`--dst-prefix=${dstPrefix}`,
@@ -271,6 +272,7 @@ export async function runGitDiff(
case "uncommitted": {
const trackedDiffArgs = [
"diff",
"--no-ext-diff",
"HEAD",
"--src-prefix=a/",
"--dst-prefix=b/",
@@ -298,6 +300,7 @@ export async function runGitDiff(
case "staged": {
const stagedDiffArgs = [
"diff",
"--no-ext-diff",
"--staged",
"--src-prefix=a/",
"--dst-prefix=b/",
@@ -312,7 +315,7 @@ export async function runGitDiff(
}
case "unstaged": {
const trackedDiffArgs = ["diff", "--src-prefix=a/", "--dst-prefix=b/"];
const trackedDiffArgs = ["diff", "--no-ext-diff", "--src-prefix=a/", "--dst-prefix=b/"];
const trackedDiff = assertGitSuccess(
await runtime.runGit(trackedDiffArgs, { cwd }),
trackedDiffArgs,
@@ -335,8 +338,8 @@ export async function runGitDiff(
);
const args =
hasParent.exitCode === 0
? ["diff", "HEAD~1..HEAD", "--src-prefix=a/", "--dst-prefix=b/"]
: ["diff", "--root", "HEAD", "--src-prefix=a/", "--dst-prefix=b/"];
? ["diff", "--no-ext-diff", "HEAD~1..HEAD", "--src-prefix=a/", "--dst-prefix=b/"]
: ["diff", "--no-ext-diff", "--root", "HEAD", "--src-prefix=a/", "--dst-prefix=b/"];
const lastCommitDiff = assertGitSuccess(
await runtime.runGit(args, { cwd }),
args,
@@ -349,6 +352,7 @@ export async function runGitDiff(
case "branch": {
const branchDiffArgs = [
"diff",
"--no-ext-diff",
`${defaultBranch}..HEAD`,
"--src-prefix=a/",
"--dst-prefix=b/",
apps/review/server/index.ts
+3 -3
View File
@@ -34,11 +34,11 @@ const gitRef = args.filter((arg) => arg !== "--staged").join(" ").trim();
// Build git diff command
let diffCommand: string[];
if (isStaged) {
diffCommand = ["git", "diff", "--staged"];
diffCommand = ["git", "diff", "--no-ext-diff", "--staged"];
} else if (gitRef) {
diffCommand = ["git", "diff", gitRef];
diffCommand = ["git", "diff", "--no-ext-diff", gitRef];
} else {
diffCommand = ["git", "diff"];
diffCommand = ["git", "diff", "--no-ext-diff"];
}
// Execute git diff
bun.lock
+4 -3
View File
@@ -1,5 +1,6 @@
{
"lockfileVersion": 1,
"configVersion": 0,
"workspaces": {
"": {
"name": "plannotator",
@@ -51,7 +52,7 @@
},
"apps/opencode-plugin": {
"name": "@plannotator/opencode",
"version": "0.13.0",
"version": "0.13.1",
"dependencies": {
"@opencode-ai/plugin": "^1.1.10",
},
@@ -73,7 +74,7 @@
},
"apps/pi-extension": {
"name": "@plannotator/pi-extension",
"version": "0.13.0",
"version": "0.13.1",
"peerDependencies": {
"@mariozechner/pi-coding-agent": ">=0.53.0",
},
@@ -153,7 +154,7 @@
},
"packages/server": {
"name": "@plannotator/server",
"version": "0.13.0",
"version": "0.13.1",
"dependencies": {
"@plannotator/shared": "workspace:*",
},
packages/shared/review-core.test.ts
+1 -1
View File
@@ -134,7 +134,7 @@ describe("review-core", () => {
expect(result.patch).toBe("");
expect(result.label).toBe("Error: branch");
expect(result.error).toContain("git diff master..HEAD");
expect(result.error).toContain("git diff --no-ext-diff master..HEAD");
});
test("git context lists worktrees and file content lookup returns old/new content", async () => {
packages/shared/review-core.ts
+7 -3
View File
@@ -188,6 +188,7 @@ async function getUntrackedFileDiffs(
const diffResult = await runtime.runGit(
[
"diff",
"--no-ext-diff",
"--no-index",
`--src-prefix=${srcPrefix}`,
`--dst-prefix=${dstPrefix}`,
@@ -271,6 +272,7 @@ export async function runGitDiff(
case "uncommitted": {
const trackedDiffArgs = [
"diff",
"--no-ext-diff",
"HEAD",
"--src-prefix=a/",
"--dst-prefix=b/",
@@ -298,6 +300,7 @@ export async function runGitDiff(
case "staged": {
const stagedDiffArgs = [
"diff",
"--no-ext-diff",
"--staged",
"--src-prefix=a/",
"--dst-prefix=b/",
@@ -312,7 +315,7 @@ export async function runGitDiff(
}
case "unstaged": {
const trackedDiffArgs = ["diff", "--src-prefix=a/", "--dst-prefix=b/"];
const trackedDiffArgs = ["diff", "--no-ext-diff", "--src-prefix=a/", "--dst-prefix=b/"];
const trackedDiff = assertGitSuccess(
await runtime.runGit(trackedDiffArgs, { cwd }),
trackedDiffArgs,
@@ -335,8 +338,8 @@ export async function runGitDiff(
);
const args =
hasParent.exitCode === 0
? ["diff", "HEAD~1..HEAD", "--src-prefix=a/", "--dst-prefix=b/"]
: ["diff", "--root", "HEAD", "--src-prefix=a/", "--dst-prefix=b/"];
? ["diff", "--no-ext-diff", "HEAD~1..HEAD", "--src-prefix=a/", "--dst-prefix=b/"]
: ["diff", "--no-ext-diff", "--root", "HEAD", "--src-prefix=a/", "--dst-prefix=b/"];
const lastCommitDiff = assertGitSuccess(
await runtime.runGit(args, { cwd }),
args,
@@ -349,6 +352,7 @@ export async function runGitDiff(
case "branch": {
const branchDiffArgs = [
"diff",
"--no-ext-diff",
`${defaultBranch}..HEAD`,
"--src-prefix=a/",
"--dst-prefix=b/",