fix(#2498): pass --no-track when branching off origin/$DEFAULT_BRANCH (#2628)

* test(#2498): guard branch-creation uses --no-track (all workflows)

* fix(#2498): pass --no-track when branching off origin/$DEFAULT_BRANCH

* chore(#2498): backfill changeset pr to 2628
This commit is contained in:
Tom Boucher
2026-07-24 22:49:29 -04:00
committed by GitHub
parent 57b2bd8368
commit c2b498e452
24 changed files with 108 additions and 45 deletions

View File

@@ -0,0 +1,5 @@
---
type: Fixed
pr: 2628
---
**`/gsd-execute-phase` and `/gsd-quick` branches no longer auto-track `origin/master`** — the branch-creation `git checkout -b <branch> origin/$DEFAULT_BRANCH` omitted `--no-track`, so with the default `branch.autoSetupMerge=true` git wired the new branch's upstream to `refs/heads/$DEFAULT_BRANCH`. A subsequent GUI sync (GitHub Desktop, VS Code) then pushed the branch's commits straight onto `origin/$DEFAULT_BRANCH`, bypassing PR review — in one project every commit of a 7-plan phase landed on `origin/master`. `--no-track` is now passed; the first `git push -u origin <branch>` sets up correct same-name tracking. (#2498)