Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit 85a8986

Browse files
authored
fix(git): disable external diff for review diff previews (pingdotgg#4854)
1 parent faea70a commit 85a8986

1 file changed

Lines changed: 18 additions & 1 deletion

File tree

‎apps/server/src/vcs/GitVcsDriverCore.ts‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,18 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
20492049
executeGit(
20502050
"GitVcsDriver.readUntrackedReviewDiffs.diff",
20512051
cwd,
2052-
["diff", "--no-index", "--patch", "--minimal", "--", "/dev/null", relativePath],
2052+
[
2053+
"diff",
2054+
"--no-index",
2055+
"--patch",
2056+
"--no-color",
2057+
"--no-ext-diff",
2058+
"--no-textconv",
2059+
"--minimal",
2060+
"--",
2061+
"/dev/null",
2062+
relativePath,
2063+
],
20532064
{
20542065
allowNonZeroExit: true,
20552066
maxOutputBytes: REVIEW_UNTRACKED_DIFF_MAX_OUTPUT_BYTES,
@@ -2094,6 +2105,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
20942105
[
20952106
"diff",
20962107
"--patch",
2108+
"--no-color",
2109+
"--no-ext-diff",
2110+
"--no-textconv",
20972111
"--minimal",
20982112
...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),
20992113
"HEAD",
@@ -2127,6 +2141,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
21272141
[
21282142
"diff",
21292143
"--patch",
2144+
"--no-color",
2145+
"--no-ext-diff",
2146+
"--no-textconv",
21302147
"--minimal",
21312148
...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),
21322149
`${baseRef}...HEAD`,

0 commit comments

Comments
 (0)