Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stromseng wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −2
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/server/src/checkpointing/Layers/CheckpointStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ const makeCheckpointStore = Effect.gen(function* () {

const diffArgs = [
"diff",
"--no-ext-diff",
"--patch",
"--minimal",
"--no-color",
Comment thread
stromseng marked this conversation as resolved.
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/vcs/GitVcsDriverCore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,7 +1371,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
const stagedPatch = yield* runGitStdoutWithOptions(
"GitVcsDriver.prepareCommitContext.stagedPatch",
cwd,
["diff", "--cached", "--patch", "--minimal"],
["diff", "--no-ext-diff", "--cached", "--patch", "--minimal"],
{
Comment thread
stromseng marked this conversation as resolved.
maxOutputBytes: PREPARED_COMMIT_PATCH_MAX_OUTPUT_BYTES,
truncateOutputAtMaxBytes: true,
Expand Down Expand Up @@ -1608,7 +1608,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
runGitStdoutWithOptions(
"GitVcsDriver.readRangeContext.diffPatch",
cwd,
["diff", "--patch", "--minimal", range],
["diff", "--no-ext-diff", "--patch", "--minimal", range],
{
Comment thread
stromseng marked this conversation as resolved.
maxOutputBytes: RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES,
truncateOutputAtMaxBytes: true,
Expand Down
Loading