defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Fix worktree cleanup and dirty-check on branch move

Browse Source
This commit is contained in:
Chris Wanstrath 2026-03-08 23:04:19 -07:00
parent 223a4406ce
commit 6b5135c96e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/commands/new.ts
View File

@ -96,6 +96,7 @@ export async function action(
die(`Session "${branch}" already exists. Use "sandlot open ${branch}" to re-enter it.`) die(`Session "${branch}" already exists. Use "sandlot open ${branch}" to re-enter it.`)
} }
const branchExisted = await git.branchExists(branch, root)
const spin = spinner("Creating worktree", branch) const spin = spinner("Creating worktree", branch)
try { try {
await git.createWorktree(branch, worktreeAbs, root) await git.createWorktree(branch, worktreeAbs, root)

19
src/git.ts
View File

@ -49,16 +49,15 @@ export async function createWorktree(branch: string, worktreePath: string, cwd:
const exists = await branchExists(branch, cwd, { fetch: true }) const exists = await branchExists(branch, cwd, { fetch: true })
let result let result
let switchedFromBranch = false
if (exists === "local") { if (exists === "local") {
// If the branch is checked out in the main worktree, switch it to main first // If the branch is checked out in the main worktree, switch it to main first
if (await currentBranch(cwd) === branch) { if (await currentBranch(cwd) === branch) {
await checkout(await mainBranch(cwd), cwd) if (await isDirty(cwd)) {
result = await $`git worktree add ${worktreePath} ${branch}`.cwd(cwd).nothrow().quiet() throw new Error(`Cannot move branch "${branch}" to a worktree: the main worktree has uncommitted changes. Commit or stash them first.`)
if (result.exitCode !== 0) {
await $`git checkout ${branch}`.cwd(cwd).nothrow().quiet()
throw new Error(`Failed to create worktree for "${branch}": ${result.stderr.toString().trim()}`)
} }
return await checkout(await mainBranch(cwd), cwd)
switchedFromBranch = true
} }
result = await $`git worktree add ${worktreePath} ${branch}`.cwd(cwd).nothrow().quiet() result = await $`git worktree add ${worktreePath} ${branch}`.cwd(cwd).nothrow().quiet()
} else if (exists === "remote") { } else if (exists === "remote") {
@ -68,6 +67,7 @@ export async function createWorktree(branch: string, worktreePath: string, cwd:
result = await $`git worktree add -b ${branch} ${worktreePath}`.cwd(cwd).nothrow().quiet() result = await $`git worktree add -b ${branch} ${worktreePath}`.cwd(cwd).nothrow().quiet()
} }
if (result.exitCode !== 0) { if (result.exitCode !== 0) {
if (switchedFromBranch) await checkout(branch, cwd).catch(() => {})
throw new Error(`Failed to create worktree for "${branch}": ${result.stderr.toString().trim()}`) throw new Error(`Failed to create worktree for "${branch}": ${result.stderr.toString().trim()}`)
} }
} }
@ -238,6 +238,9 @@ export async function branchDiff(branch: string, main: string, cwd: string): Pro
/** Detect the main branch name (main or master). */ /** Detect the main branch name (main or master). */
export async function mainBranch(cwd?: string): Promise<string> { export async function mainBranch(cwd?: string): Promise<string> {
const dir = cwd ?? "." const dir = cwd ?? "."
const result = await $`git -C ${dir} rev-parse --verify --quiet refs/heads/main`.nothrow().quiet() const main = await $`git -C ${dir} rev-parse --verify --quiet refs/heads/main`.nothrow().quiet()
return result.exitCode === 0 ? "main" : "master" if (main.exitCode === 0) return "main"
const master = await $`git -C ${dir} rev-parse --verify --quiet refs/heads/master`.nothrow().quiet()
if (master.exitCode === 0) return "master"
throw new Error("Could not detect main branch: neither \"main\" nor \"master\" exists.")
} }