mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-02-07 21:53:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(patching): disallow external diff drivers (#8179)

Browse Source
This commit is contained in:
华丽
2024-06-07 17:18:58 +08:00
committed by GitHub
parent 271386f0a0
commit 08dad01af0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/hungry-pears-allow.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@pnpm/plugin-commands-patching": patch
---
add `--no-ext-diff` disallow external diff drivers to prevent incorrect diff file formats

2
patching/plugin-commands-patching/src/patchCommit.ts
View File

@@ -111,7 +111,7 @@ async function diffFolders (folderA: string, folderB: string): Promise<string> {
let stderr!: string
try {
const result = await execa('git', ['-c', 'core.safecrlf=false', 'diff', '--src-prefix=a/', '--dst-prefix=b/', '--ignore-cr-at-eol', '--irreversible-delete', '--full-index', '--no-index', '--text', folderAN, folderBN], {
const result = await execa('git', ['-c', 'core.safecrlf=false', 'diff', '--src-prefix=a/', '--dst-prefix=b/', '--ignore-cr-at-eol', '--irreversible-delete', '--full-index', '--no-index', '--text', '--no-ext-diff', folderAN, folderBN], {
cwd: process.cwd(),
env: {
...process.env,