golem15/msd-core
4
0
Fork 0
Code Issues 1 Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
gsd-core/workflows/execute-phase.md
View File

@@ -311,10 +311,8 @@ else
else
git switch --quiet "$DEFAULT_BRANCH" 2>/dev/null && git merge --ff-only --quiet "origin/$DEFAULT_BRANCH" 2>/dev/null || true
fi
# Pinned base + fail-fast: on success HEAD is exactly at origin/$DEFAULT_BRANCH,
# so a post-creation merge-base or "ahead-of" guard would be unreachable. The
# explicit base argument here is the single source of correctness for #2916.
git checkout -b "$BRANCH_NAME" "origin/$DEFAULT_BRANCH" \
# Pinned base (#2916); --no-track (#2498) so default autoSetupMerge doesn't wire upstream to origin/$DEFAULT_BRANCH.
git checkout -b "$BRANCH_NAME" "origin/$DEFAULT_BRANCH" --no-track \
|| { echo "ERROR: Could not create '$BRANCH_NAME' from origin/$DEFAULT_BRANCH (#2916)." >&2; exit 1; }
fi
```