Function getBranchMergeBaseDiff

app/src/lib/git/diff.ts:154–187

(
  repository: Repository,
  file: FileChange,
  baseBranchName: string,
  comparisonBranchName: string,
  hideWhitespaceInDiff: boolean = false,
  latestCommit: string
)

 * (Show what would be the result of merge)
 */
export async function getBranchMergeBaseDiff(
  repository: Repository,
  file: FileChange,
  baseBranchName: string,
  comparisonBranchName: string,
  hideWhitespaceInDiff: boolean = false,
  latestCommit: string
): Promise<IDiff> {
  const args = [
    'diff',
    '--merge-base',
    baseBranchName,
    comparisonBranchName,
    ...(hideWhitespaceInDiff ? ['-w'] : []),
    '--patch-with-raw',
    '-z',
    '--no-color',
    '--',
    ensureRelativePath(file.path),
  ]

  if (
    file.status.kind === AppFileStatusKind.Renamed ||
    file.status.kind === AppFileStatusKind.Copied
  ) {
    args.push(ensureRelativePath(file.status.oldPath))
  }

  const result = await git(args, repository.path, 'getBranchMergeBaseDiff', {
    encoding: 'buffer',
  })

  return buildDiff(result.stdout, repository, file, latestCommit, latestCommit)
}

/**
 * Render the difference between two commits for a file