Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(git): disable external diff for review diff previews (#4854)

ohbentos85a898687035
diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.ts
index 73d9b6b01..3aa7575d5 100644
--- a/apps/server/src/vcs/GitVcsDriverCore.ts
+++ b/apps/server/src/vcs/GitVcsDriverCore.ts
@@ -2049,7 +2049,18 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
executeGit(
"GitVcsDriver.readUntrackedReviewDiffs.diff",
cwd,
- ["diff", "--no-index", "--patch", "--minimal", "--", "/dev/null", relativePath],
+ [
+ "diff",
+ "--no-index",
+ "--patch",
+ "--no-color",
+ "--no-ext-diff",
+ "--no-textconv",
+ "--minimal",
+ "--",
+ "/dev/null",
+ relativePath,
+ ],
{
allowNonZeroExit: true,
maxOutputBytes: REVIEW_UNTRACKED_DIFF_MAX_OUTPUT_BYTES,
@@ -2094,6 +2105,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
[
"diff",
"--patch",
+ "--no-color",
+ "--no-ext-diff",
+ "--no-textconv",
"--minimal",
...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),
"HEAD",
@@ -2127,6 +2141,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
[
"diff",
"--patch",
+ "--no-color",
+ "--no-ext-diff",
+ "--no-textconv",
"--minimal",
...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),
`${baseRef}...HEAD`,