Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-30 21:41:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - fix git diff raw parsing to correctly handle renamed files (#287020)

Browse Source
This commit is contained in:
Ladislau Szomoru
2026-01-11 19:03:10 +01:00
committed by GitHub
parent fd022013b6
commit 2c1a2eeb2d
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/git/src/git.ts
View File

@@ -1141,10 +1141,21 @@ function parseGitChangesRaw(repositoryRoot: string, raw: string): DiffChange[] {
} else {
// Parse --numstat output
const [insertions, deletions, filePath] = segment.split('\t');
numStats.set(
path.isAbsolute(filePath)
? filePath
: path.join(repositoryRoot, filePath), {
let numstatPath: string;
if (filePath === '') {
// For renamed files, filePath is empty and the old/new paths
// are in the next two null-terminated segments. We skip the
// old path and use the new path for the stats key.
index++;
const renamePath = segments[index++];
numstatPath = path.isAbsolute(renamePath) ? renamePath : path.join(repositoryRoot, renamePath);
} else {
numstatPath = path.isAbsolute(filePath) ? filePath : path.join(repositoryRoot, filePath);
}
numStats.set(numstatPath, {
insertions: insertions === '-' ? 0 : parseInt(insertions),
deletions: deletions === '-' ? 0 : parseInt(deletions),
});