defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Propagate git-add failures instead of silently swallowing them

Browse Source 
The old `stageFile` call discarded non-zero exit codes, hiding issues
like unresolved conflicts or missing files from the caller.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Chris Wanstrath 2026-04-10 08:07:43 -07:00
parent e694ab06d7
commit cc61e09384
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/helpers.ts
View File

@ -81,7 +81,7 @@ export async function teardownSession(root: string, branch: string, worktree: st
await state.removeSession(root, branch)
}
/** Lock files to skip AI resolution — accept theirs and move on (basename match covers subdirs too). */
/** Lock files to skip AI resolution — accept theirs and move on (basename match so `packages/foo/bun.lock` is also covered). */
const SKIP_RESOLVE = new Set(["bun.lock", "Cargo.lock"])
/** Resolve conflict markers in files using Claude, then stage them. */

5
src/git.ts
View File

@ -135,7 +135,10 @@ export async function commit(message: string, cwd: string): Promise<void> {
/** Stage a file. */
export async function stageFile(file: string, cwd: string): Promise<void> {
await $`git add ${file}`.cwd(cwd).nothrow().quiet()
const result = await $`git add ${file}`.cwd(cwd).nothrow().quiet()
if (result.exitCode !== 0) {
throw new Error(`Failed to stage ${file}: ${result.stderr.toString().trim()}`)
}
}
/** Finalize a merge commit after resolving conflicts. */