Skip to content

fix: fall back to FETCH_HEAD when gh pr checkout fails for branch names with / #3232

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

Merged
Kitenite merged 3 commits into from
Apr 19, 2026
Merged

fix: fall back to FETCH_HEAD when gh pr checkout fails for branch names with / #3232

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
830d4e9
fix: fall back to FETCH_HEAD checkout when gh pr checkout fails for b…
Apr 7, 2026
666e4f5
fix: use -B flag to force-replace branch in FETCH_HEAD fallback checkout
Apr 7, 2026
919665d
fix: log fallback path when gh pr checkout fails with tracking error
Apr 7, 2026
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
51 changes: 39 additions & 12 deletions apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1777,18 +1777,45 @@ export async function createWorktreeFromPr({
});
}

await execWithShellEnv(
"gh",
[
"pr",
"checkout",
String(prInfo.number),
"--branch",
localBranchName,
"--force",
],
{ cwd: worktreePath, timeout: 120_000 },
);
try {
await execWithShellEnv(
"gh",
[
"pr",
"checkout",
String(prInfo.number),
"--branch",
localBranchName,
"--force",
],
{ cwd: worktreePath, timeout: 120_000 },
);
} catch (ghError) {
const ghMsg = ghError instanceof Error ? ghError.message : String(ghError);
// `gh pr checkout` can fail with "is not a branch" when the branch name
// contains '/' (e.g. "user/feature-branch"). Git has trouble resolving
// "origin/user/feature-branch" as a tracking ref inside a worktree.
// gh already fetched the remote successfully, so FETCH_HEAD points to
// the right commit — fall back to creating the branch without tracking.
if (!ghMsg.includes("is not a branch")) {
throw ghError;
}
console.log(
`[git] gh pr checkout failed with tracking error for PR #${prInfo.number}, falling back to FETCH_HEAD checkout`,
);
await execGitWithShellPath(
[
"-C",
worktreePath,
"checkout",
"-B",
localBranchName,
"--no-track",
"FETCH_HEAD",
],
{ timeout: 30_000 },
);
Comment thread
ruangustavo marked this conversation as resolved.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

// Enable autoSetupRemote so `git push` just works without -u flag.
await execGitWithShellPath(
Expand Down
Loading