From ee6f516b2bac34b029f9be46376e520ff00c6b67 Mon Sep 17 00:00:00 2001
From: Erich Blume <blume.erich@gmail.com>
Date: Sat, 28 Mar 2026 23:03:38 -0700
Subject: [PATCH] spork-create: bail if local clone already exists

Trying to add remotes to an existing clone gets the origin wrong.
Better to error out and let the user handle it.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 mise-tasks/spork-create | 74 +++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 44 deletions(-)

diff --git a/mise-tasks/spork-create b/mise-tasks/spork-create
index 0ed5d86..9cf1b78 100755
--- a/mise-tasks/spork-create
+++ b/mise-tasks/spork-create
@@ -354,56 +354,42 @@ def main(
     else:
         local_path = LOCAL_BASE / repo_name
         if local_path.exists():
-            console.print(f"[yellow]Local directory already exists:[/yellow] {local_path}")
-            console.print("Setting up remotes on existing clone...")
-            # Add missing remotes
-            mirror_url = f"{FORGE_SSH}/{MIRROR_ORG}/{repo_name}.git"
-            subprocess.run(
-                ["git", "remote", "add", "mirror", mirror_url],
-                cwd=local_path,
-                capture_output=True,  # may already exist
+            console.print(
+                f"[red]Error:[/red] Local directory already exists: [bold]{local_path}[/bold]"
             )
-            if upstream_url and upstream_url != "unknown":
-                subprocess.run(
-                    ["git", "remote", "add", "upstream", upstream_url],
-                    cwd=local_path,
-                    capture_output=True,
-                )
+            console.print(
+                "Remove it first or use [dim]--no-clone[/dim] to skip local setup."
+            )
+            raise SystemExit(1)
+
+        console.print(f"Cloning to {local_path}...")
+        clone_url = f"{FORGE_SSH}/{OWNER}/{repo_name}.git"
+        subprocess.run(
+            ["git", "clone", clone_url, str(local_path)],
+            check=True,
+            capture_output=True,
+        )
+        # Add mirror and upstream remotes
+        mirror_url = f"{FORGE_SSH}/{MIRROR_ORG}/{repo_name}.git"
+        subprocess.run(
+            ["git", "remote", "add", "mirror", mirror_url],
+            cwd=local_path,
+            check=True,
+            capture_output=True,
+        )
+        if upstream_url and upstream_url != "unknown":
             subprocess.run(
-                ["git", "fetch", "--all"],
-                cwd=local_path,
-                check=True,
-                capture_output=True,
-            )
-        else:
-            console.print(f"Cloning to {local_path}...")
-            clone_url = f"{FORGE_SSH}/{OWNER}/{repo_name}.git"
-            subprocess.run(
-                ["git", "clone", clone_url, str(local_path)],
-                check=True,
-                capture_output=True,
-            )
-            # Add mirror and upstream remotes
-            mirror_url = f"{FORGE_SSH}/{MIRROR_ORG}/{repo_name}.git"
-            subprocess.run(
-                ["git", "remote", "add", "mirror", mirror_url],
-                cwd=local_path,
-                check=True,
-                capture_output=True,
-            )
-            if upstream_url and upstream_url != "unknown":
-                subprocess.run(
-                    ["git", "remote", "add", "upstream", upstream_url],
-                    cwd=local_path,
-                    check=True,
-                    capture_output=True,
-                )
-            subprocess.run(
-                ["git", "fetch", "--all"],
+                ["git", "remote", "add", "upstream", upstream_url],
                 cwd=local_path,
                 check=True,
                 capture_output=True,
             )
+        subprocess.run(
+            ["git", "fetch", "--all"],
+            cwd=local_path,
+            check=True,
+            capture_output=True,
+        )
         console.print(f"[green]Local clone ready at {local_path}[/green]")
 
     # Summary