defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

yup

Browse Source
This commit is contained in:
Chris Wanstrath 2026-03-09 19:46:41 -07:00
parent 5cc102ccdf
commit 1549ddc4e6
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands/new.ts
View File

@ -99,17 +99,11 @@ export async function action(
const spin = spinner("Creating worktree", branch) const spin = spinner("Creating worktree", branch)
let branchCreated = false let branchCreated = false
try { try {
<<<<<<< HEAD const wt = await git.createWorktree(branch, worktreeAbs, root)
await git.createWorktree(branch, worktreeAbs, root) branchCreated = wt.branchCreated
const symlinkPath = join(root, '.sandlot', branch) const symlinkPath = join(root, '.sandlot', branch)
await mkdir(dirname(symlinkPath), { recursive: true }) await mkdir(dirname(symlinkPath), { recursive: true })
await symlink(worktreeAbs, symlinkPath) await symlink(worktreeAbs, symlinkPath)
=======
const wt = await git.createWorktree(branch, worktreeAbs, root)
branchCreated = wt.branchCreated
await mkdir(join(root, '.sandlot'), { recursive: true })
await symlink(worktreeAbs, join(root, '.sandlot', branch))
>>>>>>> 597eb97 (Track branch creation to avoid deleting pre-existing branches)
spin.text = "Starting container" spin.text = "Starting container"
await vm.ensure((msg) => { spin.text = msg }) await vm.ensure((msg) => { spin.text = msg })
@ -117,13 +111,8 @@ export async function action(
} catch (err) { } catch (err) {
spin.fail(String((err as Error).message ?? err)) spin.fail(String((err as Error).message ?? err))
await git.removeWorktree(worktreeAbs, root).catch(() => {}) await git.removeWorktree(worktreeAbs, root).catch(() => {})
<<<<<<< HEAD
await git.deleteLocalBranch(branch, root).catch(() => {})
await unlinkSessionSymlink(root, branch)
=======
if (branchCreated) await git.deleteLocalBranch(branch, root).catch(() => {}) if (branchCreated) await git.deleteLocalBranch(branch, root).catch(() => {})
await unlink(join(root, '.sandlot', branch)).catch(() => {}) await unlinkSessionSymlink(root, branch)
>>>>>>> 597eb97 (Track branch creation to avoid deleting pre-existing branches)
process.exit(1) process.exit(1)
} }