Skip to content

fix(fleet): restore the origin/main tracking ref on drifted Windows clones #6

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
sheehanmunim merged 1 commit into from
Aug 19, 2026
Merged

fix(fleet): restore the origin/main tracking ref on drifted Windows clones #6

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
16 changes: 13 additions & 3 deletions scripts/personal-refresh-win.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,24 @@ if ($LASTEXITCODE -ne 0) {
git remote set-url origin $productRepoUrl
}

# A single-branch clone from the old repo carries a refspec that no longer
# writes refs/remotes/origin/main, so a bare `git fetch origin main` only
# updates FETCH_HEAD and origin/main stays missing. Restate the refspec so the
# tracking ref exists on every machine, however its clone was made.
git config remote.origin.fetch "+refs/heads/main:refs/remotes/origin/main"
git fetch origin main
if ($LASTEXITCODE -ne 0) {
Log "fetch from origin failed - refusing to build a stale checkout"
exit 1
}
$new = (git rev-parse origin/main 2>$null)
if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($new)) {
Log "origin/main did not resolve - refusing to build a stale checkout"
# Fall back to what the fetch just brought down rather than building
# whatever this machine was sitting on.
$new = (git rev-parse FETCH_HEAD 2>$null)
}
if ([string]::IsNullOrWhiteSpace($new)) {
Log "could not resolve the product branch - refusing to build a stale checkout"
exit 1
}
$new = $new.Trim()
Expand All @@ -77,8 +87,8 @@ if (($new -eq $old) -and ($force -ne "1")) {
Log "no changes but staged installer missing - rebuilding"
}

git checkout -B main origin/main
git reset --hard origin/main
git checkout -B main $new
git reset --hard $new

# Bake Connect public client config into desktop artifacts (gitignored .env).
# Without this, hasCloudPublicConfig() is false and Connect UI is omitted.
Expand Down
Loading