Skip to content

fix(git): pass --no-ext-diff to patch-emitting git diff calls #2352

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

Closed
avshyz wants to merge 1 commit into from
Closed

fix(git): pass --no-ext-diff to patch-emitting git diff calls #2352

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
10 changes: 9 additions & 1 deletion apps/server/src/checkpointing/Layers/CheckpointStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,15 @@ const makeCheckpointStore = Effect.gen(function* () {
const result = yield* git.execute({
operation,
cwd: input.cwd,
args: ["diff", "--patch", "--minimal", "--no-color", fromCommitOid, toCommitOid],
args: [
"diff",
"--no-ext-diff",
"--patch",
"--minimal",
"--no-color",
fromCommitOid,
toCommitOid,
],
maxOutputBytes: CHECKPOINT_DIFF_MAX_OUTPUT_BYTES,
});

Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/git/Layers/GitCore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
const stagedPatch = yield* runGitStdoutWithOptions(
"GitCore.prepareCommitContext.stagedPatch",
cwd,
["diff", "--cached", "--patch", "--minimal"],
["diff", "--no-ext-diff", "--cached", "--patch", "--minimal"],
{
maxOutputBytes: PREPARED_COMMIT_PATCH_MAX_OUTPUT_BYTES,
truncateOutputAtMaxBytes: true,
Expand Down Expand Up @@ -1610,7 +1610,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
runGitStdoutWithOptions(
"GitCore.readRangeContext.diffPatch",
cwd,
["diff", "--patch", "--minimal", range],
["diff", "--no-ext-diff", "--patch", "--minimal", range],
{
maxOutputBytes: RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES,
truncateOutputAtMaxBytes: true,
Expand Down
Loading