Function mergeWith

packages/computer/src/git/network.ts:383–421

(opts: MergeWithDeps)

}

export async function mergeWith(opts: MergeWithDeps): Promise<MergeResult> {
  const dir = opts.dir ?? "/";
  const author = resolveIdent(
    opts.author,
    opts.env?.GIT_AUTHOR_NAME,
    opts.env?.GIT_AUTHOR_EMAIL,
    opts.defaultIdentity,
  );
  const committer =
    resolveIdent(
      opts.committer,
      opts.env?.GIT_COMMITTER_NAME ?? opts.env?.GIT_AUTHOR_NAME,
      opts.env?.GIT_COMMITTER_EMAIL ?? opts.env?.GIT_AUTHOR_EMAIL,
      opts.defaultIdentity,
    ) ?? author;
  try {
    return await opts.git.merge({
      fs: opts.fs,
      dir,
      ours: opts.ours,
      theirs: opts.theirs,
      fastForward: opts.fastForward,
      fastForwardOnly: opts.fastForwardOnly,
      message: opts.message,
      author,
      committer,
      cache: opts.cache,
    });
  } catch (cause) {
    if (isNotARepositoryCause(cause)) throw new NotARepositoryError(dir, { cause });
    if (
      cause instanceof Error &&
      /Missing(Name|Email)Error|identity|cannot author/i.test(cause.message)
    ) {
      throw new MissingIdentityError({ cause });
    }
    throw new GitError("EMERGEFAIL", `git merge failed: ${errorMessage(cause)}`, { cause });
  }
}

// ---------------------------------------------------------------
// remote add / remove / list