defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Refactor worktree branch checkout logic

Browse Source
This commit is contained in:
Chris Wanstrath 2026-03-08 22:51:33 -07:00
parent c09f7ced5f
commit 223a4406ce
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/git.ts
View File

@ -51,13 +51,14 @@ export async function createWorktree(branch: string, worktreePath: string, cwd:
let result
if (exists === "local") {
// If the branch is checked out in the main worktree, switch it to main first
const current = await $`git -C ${cwd} rev-parse --abbrev-ref HEAD`.nothrow().quiet().text()
if (current.trim() === branch) {
const main = await mainBranch(cwd)
const sw = await $`git -C ${cwd} checkout ${main}`.nothrow().quiet()
if (sw.exitCode !== 0) {
throw new Error(`Cannot move "${cwd}" off branch "${branch}": ${sw.stderr.toString().trim()}`)
if (await currentBranch(cwd) === branch) {
await checkout(await mainBranch(cwd), cwd)
result = await $`git worktree add ${worktreePath} ${branch}`.cwd(cwd).nothrow().quiet()
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
}
result = await $`git worktree add ${worktreePath} ${branch}`.cwd(cwd).nothrow().quiet()
} else if (exists === "remote") {