fix(git): pass --no-ext-diff to patch-emitting git diff calls#2352
fix(git): pass --no-ext-diff to patch-emitting git diff calls#2352avshyz wants to merge 1 commit intopingdotgg:mainfrom
Conversation
Patches consumed by parsePatchFiles (@pierre/diffs) honored the user's diff.external config, so users with a structural differ set globally (difftastic, delta-as-ext-diff, etc.) saw 'Unsupported diff format. Showing raw patch.' in the diff panel. Add --no-ext-diff to the three call sites whose stdout flows into parsePatchFiles: - CheckpointStore.diffCheckpoints - GitCore.prepareCommitContext.stagedPatch - GitCore.readRangeContext.diffPatch
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
ApprovabilityVerdict: Approved Straightforward defensive fix adding You can customize Macroscope's approvability policy. Learn more. |
Without
--no-ext-diff, patches passed toparsePatchFiles(@pierre/diffs) honor the user'sdiff.externalconfig — anyone with difftastic / delta set globally got "Unsupported diff format. Showing raw patch." in the diff panel.Adds
--no-ext-diffto the three call sites whose stdout is parsed:CheckpointStore.diffCheckpointsGitCore.prepareCommitContext.stagedPatchGitCore.readRangeContext.diffPatchRepro
Make an edit → diff panel falls back to raw patch.