defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

add --force flag to merge and squash commands

Browse Source
This commit is contained in:
Chris Wanstrath 2026-02-27 07:48:21 -08:00
parent 920b4d12b4
commit 392d3c787b
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli.ts
View File

@ -128,14 +128,16 @@ program
program program
.command("merge") .command("merge")
.argument("<branch>", "branch name") .argument("<branch>", "branch name")
.option("-f, --force", "allow merging into a non-main branch")
.description("Merge a branch into main and close the session") .description("Merge a branch into main and close the session")
.action(mergeAction) .action((branch: string, opts: { force?: boolean }) => mergeAction(branch, opts))
program program
.command("squash") .command("squash")
.argument("<branch>", "branch name") .argument("<branch>", "branch name")
.option("-f, --force", "allow merging into a non-main branch")
.description("Squash-merge a branch into main and close the session") .description("Squash-merge a branch into main and close the session")
.action(squashAction) .action((branch: string, opts: { force?: boolean }) => squashAction(branch, opts))
program program
.command("rebase") .command("rebase")

6
src/commands/helpers.ts
View File

@ -91,12 +91,12 @@ export async function resolveConflicts(
} }
/** Merge (or squash-merge) a branch into main, resolve conflicts if needed, and close the session. */ /** Merge (or squash-merge) a branch into main, resolve conflicts if needed, and close the session. */
export async function mergeAndClose(branch: string, opts?: { squash?: boolean }): Promise<void> { export async function mergeAndClose(branch: string, opts?: { squash?: boolean; force?: boolean }): Promise<void> {
const root = await git.repoRoot() const root = await git.repoRoot()
const main = await git.mainBranch(root) const main = await git.mainBranch(root)
const current = await git.currentBranch(root) const current = await git.currentBranch(root)
if (current !== main) { if (current !== main && !opts?.force) {
die(`You must be on "${main}" to merge. Currently on "${current}".`) die(`You must be on "${main}" to merge. Currently on "${current}". Use --force to merge into "${current}" anyway.`)
} }
const session = await state.getSession(root, branch) const session = await state.getSession(root, branch)

4
src/commands/merge.ts
View File

@ -1,5 +1,5 @@
import { mergeAndClose } from "./helpers.ts" import { mergeAndClose } from "./helpers.ts"
export async function action(branch: string) { export async function action(branch: string, opts?: { force?: boolean }) {
await mergeAndClose(branch) await mergeAndClose(branch, { force: opts?.force })
} }

4
src/commands/squash.ts
View File

@ -1,5 +1,5 @@
import { mergeAndClose } from "./helpers.ts" import { mergeAndClose } from "./helpers.ts"
export async function action(branch: string) { export async function action(branch: string, opts?: { force?: boolean }) {
await mergeAndClose(branch, { squash: true }) await mergeAndClose(branch, { squash: true, force: opts?.force })
} }