From 4e09aed9d8e6076f12d226c392956ed9a788af80 Mon Sep 17 00:00:00 2001
From: Erich Blume <blume.erich@gmail.com>
Date: Sun, 29 Mar 2026 00:28:00 -0700
Subject: [PATCH] spork-create: fix ambiguous main branch checkout in
 mirror-sync template

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>
---
 mise-tasks/spork-create | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mise-tasks/spork-create b/mise-tasks/spork-create
index 789cc4e..4aed2b1 100755
--- a/mise-tasks/spork-create
+++ b/mise-tasks/spork-create
@@ -153,7 +153,7 @@ def mirror_sync_workflow(main_branch: str, repo_name: str) -> str:
 
               - name: Fast-forward {main_branch} from mirror
                 run: |
-                  git checkout {main_branch}
+                  git checkout -B {main_branch} origin/{main_branch}
                   git merge --ff-only mirror/{main_branch}
                   git push origin {main_branch}