Skip to content

fix(github): ensure local branch exists for fork PR checkout #1454

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
arnestrickmann merged 2 commits into from
Mar 13, 2026
+15 −3
Merged

fix(github): ensure local branch exists for fork PR checkout #1454

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60cfd4a
fix(github): ensure local branch exists for fork PR checkout
jschwxrz Mar 13, 2026
ce54308
fix(github): clarify PR checkout fallback messaging
jschwxrz Mar 13, 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
18 changes: 15 additions & 3 deletions src/main/services/GitHubService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ export class GitHubService {
{ cwd: projectPath }
);
} catch (fetchError) {
// Fallback: try gh pr checkout with detach to avoid working tree conflicts
// Fallback: use gh pr checkout to create/sync the local PR branch.
console.warn(
'Fetch-based PR branch creation failed, falling back to gh pr checkout:',
fetchError
Expand All @@ -915,11 +915,23 @@ export class GitHubService {

try {
await this.execGH(
`gh pr checkout ${JSON.stringify(String(prNumber))} --branch ${JSON.stringify(safeBranch)} --force --detach`,
`gh pr checkout ${JSON.stringify(String(prNumber))} --branch ${JSON.stringify(safeBranch)} --force`,
{ cwd: projectPath }
);
// Some gh/fork combinations can leave HEAD detached without a local branch ref.
// Ensure the requested local branch exists for downstream worktree creation.
try {
await execAsync(
`git show-ref --verify --quiet ${JSON.stringify(`refs/heads/${safeBranch}`)}`,
{ cwd: projectPath }
);
} catch {
await execAsync(`git branch --force ${JSON.stringify(safeBranch)} HEAD`, {
cwd: projectPath,
});
}
} catch (error) {
console.error('Failed to checkout pull request branch via gh:', error);
console.error('Failed during PR branch checkout or local-ref creation:', error);
throw error;
} finally {
if (previousRef && previousRef !== safeBranch) {
Expand Down
Loading