defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Fix squash error handling and exit codes

Browse Source 
Skip unnecessary rollback when reset never happened, show fallback
notice when AI commit message generation fails, and exit non-zero
when squash produces no changes.
This commit is contained in:
Chris Wanstrath 2026-04-10 08:44:18 -07:00
parent f1825c65da
commit 106ff20de7
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/commands/squash.ts
View File

@ -22,9 +22,11 @@ export async function action(branch: string) {
const originalHead = await git.headRef(worktree) const originalHead = await git.headRef(worktree)
const spin = spinner("Squashing", branch) const spin = spinner("Squashing", branch)
let didReset = false
try { try {
await git.resetSoft(base, worktree) await git.resetSoft(base, worktree)
didReset = true
spin.text = "Starting container" spin.text = "Starting container"
await vm.ensure((msg) => { spin.text = msg }) await vm.ensure((msg) => { spin.text = msg })
@ -35,7 +37,7 @@ export async function action(branch: string) {
if (!diff.trim()) { if (!diff.trim()) {
await git.resetSoft(originalHead, worktree) await git.resetSoft(originalHead, worktree)
spin.fail("No changes after squash") spin.fail("No changes after squash")
return process.exit(1)
} }
const gen = await vm.claudePipe( const gen = await vm.claudePipe(
@ -43,16 +45,23 @@ export async function action(branch: string) {
"Write a commit message summarizing all changes. Subject line: imperative mood, max 72 characters, no period. Add a blank line then a concise body with the key changes as bullet points. Output only the raw commit message, no quotes or markdown.", "Write a commit message summarizing all changes. Subject line: imperative mood, max 72 characters, no period. Add a blank line then a concise body with the key changes as bullet points. Output only the raw commit message, no quotes or markdown.",
) )
if (gen.exitCode !== 0 || !gen.stdout.trim()) {
spin.text = "AI commit message failed, using fallback"
}
const msg = (gen.exitCode === 0 && gen.stdout.trim()) || `squash ${branch}` const msg = (gen.exitCode === 0 && gen.stdout.trim()) || `squash ${branch}`
await git.commit(msg, worktree) await git.commit(msg, worktree)
spin.succeed(`Squashed ${branch} into a single commit`) spin.succeed(`Squashed ${branch} into a single commit`)
} catch (err) { } catch (err) {
const restored = await git.resetSoft(originalHead, worktree).then(() => true).catch(() => false)
const message = err instanceof Error ? err.message : String(err) const message = err instanceof Error ? err.message : String(err)
spin.fail(restored if (!didReset) {
? `Squash failed, changes restored: ${message}` spin.fail(`Squash failed: ${message}`)
: `Squash failed and rollback failed — check "git reflog" in the worktree: ${message}`) } else {
const restored = await git.resetSoft(originalHead, worktree).then(() => true).catch(() => false)
spin.fail(restored
? `Squash failed, changes restored: ${message}`
: `Squash failed and rollback failed — check "git reflog" in the worktree: ${message}`)
}
process.exit(1) process.exit(1)
} }
} }