development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-30 06:03:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parse diff info from git's stdout and not stdout+stderr

Browse source 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
This commit is contained in:
Sergio Padrino 2023-08-28 08:48:42 +02:00
parent 227b1e3701
commit afe838dff1
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
)