mirror of
https://github.com/desktop/desktop
synced 2024-08-28 12:40:55 +00:00
Merge pull request #17281 from desktop/fix-log-parsing
Fix diff parsing
This commit is contained in:
commit
0d03faca5e
|
@ -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
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue