Skip to content

fix(snapshot): handle git add failures with --ignore-errors fallback #9715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yimingll wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −1
Open

fix(snapshot): handle git add failures with --ignore-errors fallback #9715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion packages/opencode/src/snapshot/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,22 @@ export namespace Snapshot {
await $`git --git-dir ${git} config core.autocrlf false`.quiet().nothrow()
log.info("initialized")
}
await $`git --git-dir ${git} --work-tree ${Instance.worktree} add .`.quiet().cwd(Instance.directory).nothrow()
// Try to add all files, with fallback for problematic files (e.g., Windows reserved names like 'nul')
const addResult = await $`git --git-dir ${git} --work-tree ${Instance.worktree} add .`
.quiet()
.cwd(Instance.directory)
.nothrow()
if (addResult.exitCode !== 0) {
log.warn("git add failed, retrying with --ignore-errors", {
exitCode: addResult.exitCode,
stderr: addResult.stderr.toString(),
})
// Retry with --ignore-errors to skip problematic files and continue
await $`git --git-dir ${git} --work-tree ${Instance.worktree} add --ignore-errors .`
.quiet()
.cwd(Instance.directory)
.nothrow()
}
const hash = await $`git --git-dir ${git} --work-tree ${Instance.worktree} write-tree`
.quiet()
.cwd(Instance.directory)
Expand Down
Loading