Skip to content

fix(worktree): fetch base branch before creating worktree #35

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
aletc1 merged 1 commit into from
Apr 24, 2026
Merged

fix(worktree): fetch base branch before creating worktree #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/main/lib/git/worktree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
animals,
uniqueNamesGenerator,
} from "unique-names-generator";
import { createGitForNetwork, withGitLock } from "./git-factory";
import { checkGitLfsAvailable, getShellEnvironment } from "./shell-env";
import { executeWorktreeSetup } from "./worktree-config";
import type { WorktreeSetupResult } from "./worktree-config";
Expand Down Expand Up @@ -969,6 +970,24 @@ export async function createWorktreeForChat(
// Use provided base branch or auto-detect
const baseBranch = selectedBaseBranch || await getDefaultBranch(projectPath);

// Best-effort: refresh origin/<baseBranch> so the worktree is based on the
// latest remote state. Skipped for local-type branches (user opted into a
// local ref) and when no origin remote exists. Never blocks creation.
if (branchType !== "local" && (await hasOriginRemote(projectPath))) {
try {
await withGitLock(projectPath, async () => {
const netGit = createGitForNetwork(projectPath);
await netGit.fetch("origin", baseBranch);
});
} catch (fetchError) {
const msg =
fetchError instanceof Error ? fetchError.message : String(fetchError);
console.warn(
`[worktree] Pre-create fetch of origin/${baseBranch} failed: ${msg}`,
);
}
}

const branch = generateBranchName();
const worktreesDir = join(homedir(), ".21st", "worktrees");
const projectWorktreeDir = join(worktreesDir, projectSlug);
Expand Down