development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-08-28 12:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17281 from desktop/fix-log-parsing

Browse source 
Fix diff parsing
This commit is contained in:
Sergio Padrino 2023-08-29 16:04:01 +02:00 committed by GitHub
parent 03fe68ced6 afe838dff1
commit 0d03faca5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/lib/git/diff.ts
View file

@ -175,12 +175,7 @@ export async function getBranchMergeBaseDiff(
maxBuffer: Infinity,
})
return buildDiff(
Buffer.from(result.combinedOutput),
repository,
file,
latestCommit
)
return buildDiff(Buffer.from(result.stdout), repository, file, latestCommit)
}
/**
@ -237,12 +232,7 @@ export async function getCommitRangeDiff(
)
}
return buildDiff(
Buffer.from(result.combinedOutput),
repository,
file,
latestCommit
)
return buildDiff(Buffer.from(result.stdout), repository, file, latestCommit)
}
/**
@ -285,7 +275,7 @@ export async function getBranchMergeBaseChangedFiles(
)
return parseRawLogWithNumstat(
result.combinedOutput,
result.stdout,
`${latestComparisonBranchCommitRef}`,
mergeBaseCommit
)