From c9f00dba0e34ceac1c8d14f70c1e1ba08039a3d8 Mon Sep 17 00:00:00 2001 From: Mark Amery Date: Tue, 20 Jan 2026 12:21:07 +0000 Subject: [PATCH 1/3] Backport https://github.com/kpdecker/jsdiff/pull/647 --- src/patch/parse.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/patch/parse.js b/src/patch/parse.js index d1af8d3dc..8eb9074ec 100755 --- a/src/patch/parse.js +++ b/src/patch/parse.js @@ -18,9 +18,9 @@ export function parsePatch(uniDiff, options = {}) { } // Diff index - let header = (/^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/).exec(line); - if (header) { - index.index = header[1]; + let headerMatch = (/^(?:Index:|diff(?: -r \w+)+)\s+/).exec(line); + if (headerMatch) { + index.index = line.substring(headerMatch[0].length).trim(); } i++; From 2f5bf5eebedadc92474c70863e556f9820e31aa7 Mon Sep 17 00:00:00 2001 From: Mark Amery Date: Tue, 20 Jan 2026 12:30:56 +0000 Subject: [PATCH 2/3] Backport https://github.com/kpdecker/jsdiff/pull/649 --- src/patch/parse.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/patch/parse.js b/src/patch/parse.js index 8eb9074ec..dfbaafb04 100755 --- a/src/patch/parse.js +++ b/src/patch/parse.js @@ -53,12 +53,12 @@ export function parsePatch(uniDiff, options = {}) { // Parses the --- and +++ headers, if none are found, no lines // are consumed. function parseFileHeader(index) { - const fileHeader = (/^(---|\+\+\+)\s+(.*)$/).exec(diffstr[i]); - if (fileHeader) { - let keyPrefix = fileHeader[1] === '---' ? 'old' : 'new'; - const data = fileHeader[2].split('\t', 2); + const fileHeaderMatch = (/^(---|\+\+\+)\s+/).exec(diffstr[i]); + if (fileHeaderMatch) { + let keyPrefix = fileHeaderMatch[1] === '---' ? 'old' : 'new'; + const data = diffstr[i].substring(3).trim().split('\t', 2); let fileName = data[0].replace(/\\\\/g, '\\'); - if (/^".*"$/.test(fileName)) { + if (fileName.startsWith('"') && fileName.endsWith('"')) { fileName = fileName.substr(1, fileName.length - 2); } index[keyPrefix + 'FileName'] = fileName; From e8bb42240c6adbbcdad7754f37b094081c9e7112 Mon Sep 17 00:00:00 2001 From: Mukil Elango Date: Fri, 23 Jan 2026 09:19:43 +0000 Subject: [PATCH 3/3] v3.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2376bfb6..8b6fddb28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "diff", - "version": "3.5.0", + "version": "3.5.1", "description": "A javascript text diff implementation.", "keywords": [ "diff",