Skip to content

Commit 7db0349

Browse files
fix(git): disable external diff for patch output (#2553)
Co-authored-by: Julius Marminge <[email protected]>
1 parent 57f6bf7 commit 7db0349

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
14941494
const stagedPatch = yield* runGitStdoutWithOptions(
14951495
"GitVcsDriver.prepareCommitContext.stagedPatch",
14961496
cwd,
1497-
["diff", "--cached", "--patch", "--minimal"],
1497+
["diff", "--no-ext-diff", "--cached", "--patch", "--minimal"],
14981498
{
14991499
maxOutputBytes: PREPARED_COMMIT_PATCH_MAX_OUTPUT_BYTES,
15001500
appendTruncationMarker: true,
@@ -1731,7 +1731,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
17311731
runGitStdoutWithOptions(
17321732
"GitVcsDriver.readRangeContext.diffPatch",
17331733
cwd,
1734-
["diff", "--patch", "--minimal", range],
1734+
["diff", "--no-ext-diff", "--patch", "--minimal", range],
17351735
{
17361736
maxOutputBytes: RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES,
17371737
appendTruncationMarker: true,

0 commit comments

Comments
 (0)