eblume/blumeops
1
1
Fork 0
Code Issues Pull requests Projects Releases 83 Packages Wiki Activity Actions

spork-create: fix ambiguous main branch checkout in mirror-sync template

Browse source 
git checkout <branch> is ambiguous when both origin and mirror remotes
have the same branch name. Use -B to explicitly create from origin.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Erich Blume 2026-03-29 00:28:00 -07:00
commit 4e09aed9d8
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mise-tasks/spork-create
View file

@ -153,7 +153,7 @@ def mirror_sync_workflow(main_branch: str, repo_name: str) -> str:
- name: Fast-forward {main_branch} from mirror - name: Fast-forward {main_branch} from mirror
run: | run: |
git checkout {main_branch} git checkout -B {main_branch} origin/{main_branch}
git merge --ff-only mirror/{main_branch} git merge --ff-only mirror/{main_branch}
git push origin {main_branch} git push origin {main_branch}