Function runMerge

packages/computer/src/git/cli.ts:1564–1618

(
  client: GitClient,
  args: string[],
  input: GitCliInput,
)

// ---------------------------------------------------------------

async function runMerge(
  client: GitClient,
  args: string[],
  input: GitCliInput,
): Promise<GitCliResult> {
  const parsed = parseFlags(args, {
    "ff-only": { kind: "bool" },
    "no-ff": { kind: "bool" },
    message: { kind: "value", alias: ["m"] },
  });
  if ("error" in parsed) {
    return { stdout: "", stderr: `git merge: ${parsed.error}\n`, exitCode: 129 };
  }
  if (parsed.positional.length === 0) {
    return { stdout: "", stderr: "git merge: missing <ref>\n", exitCode: 129 };
  }
  if (parsed.positional.length > 1) {
    return {
      stdout: "",
      stderr: `git merge: unexpected argument '${parsed.positional[1]}'\n`,
      exitCode: 129,
    };
  }
  const dir = resolveDir(undefined, input.cwd);
  try {
    const result = await client.merge({
      dir,
      theirs: parsed.positional[0],
      fastForwardOnly: parsed.flags["ff-only"] === true,
      fastForward: parsed.flags["no-ff"] === true ? false : undefined,
      message: parsed.flags.message as string | undefined,
      env: input.env,
    });
    if (result.alreadyMerged) {
      return { stdout: "Already up to date.\n", stderr: "", exitCode: 0 };
    }
    if (result.fastForward && result.oid) {
      return {
        stdout: `Fast-forward to ${result.oid.slice(0, 7)}\n`,
        stderr: "",
        exitCode: 0,
      };
    }
    if (result.oid) {
      return {
        stdout: `Merge commit ${result.oid.slice(0, 7)}\n`,
        stderr: "",
        exitCode: 0,
      };
    }
    return { stdout: "", stderr: "", exitCode: 0 };
  } catch (cause) {
    return mapGitError("merge", cause);
  }
}

// ---------------------------------------------------------------
// remote