defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Handle reset failure gracefully when squash produces no changes

Browse Source 
The reset during early exit could throw if the worktree is already in a
conflicted state, masking the real "no changes" diagnostic.
This commit is contained in:
Chris Wanstrath 2026-04-10 08:58:45 -07:00
parent 106ff20de7
commit f226f30e6f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/squash.ts
View File

@ -35,7 +35,7 @@ export async function action(branch: string) {
const diff = await git.diffStaged(worktree) const diff = await git.diffStaged(worktree)
if (!diff.trim()) { if (!diff.trim()) {
await git.resetSoft(originalHead, worktree) await git.resetSoft(originalHead, worktree).catch(() => {})
spin.fail("No changes after squash") spin.fail("No changes after squash")
process.exit(1) process.exit(1)
} }