authorgravatar for magnus.stromseng@gmail.comMagnus Alexander Strømseng <magnus.stromseng@gmail.com> 2026-06-12 03:18:13+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2026-06-11 18:18:13-07:00
log7db034905b49e6c3448057e484a50e14ebb64d80
tree22be1dde7a8fed4eeb87edafa718017d46fb2ef5
parent57f6bf7edbaec3a652245c15b65b320d58571deb
signature Signed by PGP key B5690EEEBB952194

fix(git): disable external diff for patch output (#2553)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

1 files changed, 2 insertions(+), 2 deletions(-)

apps/server/src/vcs/GitVcsDriverCore.ts+2-2
...@@ -1494,7 +1494,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*...@@ -1494,7 +1494,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
1494 const stagedPatch = yield* runGitStdoutWithOptions(1494 const stagedPatch = yield* runGitStdoutWithOptions(
1495 "GitVcsDriver.prepareCommitContext.stagedPatch",1495 "GitVcsDriver.prepareCommitContext.stagedPatch",
1496 cwd,1496 cwd,
1497 ["diff", "--cached", "--patch", "--minimal"],1497 ["diff", "--no-ext-diff", "--cached", "--patch", "--minimal"],
1498 {1498 {
1499 maxOutputBytes: PREPARED_COMMIT_PATCH_MAX_OUTPUT_BYTES,1499 maxOutputBytes: PREPARED_COMMIT_PATCH_MAX_OUTPUT_BYTES,
1500 appendTruncationMarker: true,1500 appendTruncationMarker: true,
...@@ -1731,7 +1731,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*...@@ -1731,7 +1731,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
1731 runGitStdoutWithOptions(1731 runGitStdoutWithOptions(
1732 "GitVcsDriver.readRangeContext.diffPatch",1732 "GitVcsDriver.readRangeContext.diffPatch",
1733 cwd,1733 cwd,
1734 ["diff", "--patch", "--minimal", range],1734 ["diff", "--no-ext-diff", "--patch", "--minimal", range],
1735 {1735 {
1736 maxOutputBytes: RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES,1736 maxOutputBytes: RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES,
1737 appendTruncationMarker: true,1737 appendTruncationMarker: true,