defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Add pre-merge validation in mergeAndClose

Browse Source
This commit is contained in:
Chris Wanstrath 2026-02-27 07:45:09 -08:00
parent bcca8808f3
commit 920b4d12b4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/commands/helpers.ts
View File

@ -93,6 +93,11 @@ 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 }): Promise<void> {
const root = await git.repoRoot() const root = await git.repoRoot()
const main = await git.mainBranch(root)
const current = await git.currentBranch(root)
if (current !== main) {
die(`You must be on "${main}" to merge. Currently on "${current}".`)
}
const session = await state.getSession(root, branch) const session = await state.getSession(root, branch)
if (session && await git.isDirty(session.worktree)) { if (session && await git.isDirty(session.worktree)) {