Skip to content

fix(dev): worktree setup never deletes a real env file #15845

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 1 commit into from
Oct 5, 2026
Merged

fix(dev): worktree setup never deletes a real env file #15845

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
23 changes: 15 additions & 8 deletions scripts/setup-worktree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,22 @@ const install = NodeChildProcess.spawnSync("vp i", {
});
if (install.status !== 0) process.exit(install.status ?? 1);

// In the main checkout itself, relinking would replace the real env files.
if (NodeFS.realpathSync(projectRoot) !== NodeFS.realpathSync(worktree)) {
for (const file of ENV_FILES) {
const source = NodePath.join(projectRoot, file);
if (!NodeFS.existsSync(source)) continue;
const target = NodePath.join(worktree, file);
NodeFS.rmSync(target, { force: true });
NodeFS.symlinkSync(source, target);
// Env files live as real files in the main checkout; worktrees only get
// symlinks to them. Only a symlink is ever replaced, so a real env file is
// never deleted, including when this runs in the main checkout itself.
for (const file of ENV_FILES) {
const source = NodePath.join(projectRoot, file);
const sourceStat = NodeFS.lstatSync(source, { throwIfNoEntry: false });
if (!sourceStat) continue;
if (!sourceStat.isFile()) {
console.warn(`Skipping ${file}: ${source} is not a regular file.`);
continue;
}
const target = NodePath.join(worktree, file);
const existing = NodeFS.lstatSync(target, { throwIfNoEntry: false });
if (existing && !existing.isSymbolicLink()) continue;
if (existing) NodeFS.rmSync(target);
NodeFS.symlinkSync(source, target);
}

const warm = NodeChildProcess.spawnSync(
Expand Down
Loading