diff --git a/src/commands/squash.ts b/src/commands/squash.ts index 0236081..764edf9 100644 --- a/src/commands/squash.ts +++ b/src/commands/squash.ts @@ -35,7 +35,7 @@ export async function action(branch: string) { const diff = await git.diffStaged(worktree) if (!diff.trim()) { - await git.resetSoft(originalHead, worktree) + await git.resetSoft(originalHead, worktree).catch(() => {}) spin.fail("No changes after squash") process.exit(1) }