Merge pull request #14 from bkildow/feature/main-branch-config

Add configurable main_branch to .worktree.yml

Author: bkildow

README.md

@@ -257,7 +257,7 @@ parallel_teardown:
 |-------|-------------|---------|
 | `version` | Config version | `1` |
 | `git_dir` | Path to bare repository | `.bare` |
-| `main_branch` | Primary branch (protected from removal, used as base for new branches) | `main` |
+| `main_branch` | Primary branch (branch ref protected from deletion, used as base for new branches) | `main` |
 | `editor` | Preferred editor binary name | (auto-detect) |
 | `setup` | Commands to run sequentially after creating a worktree | `[]` |
 | `parallel_setup` | Commands to run concurrently after serial setup hooks | `[]` |

cmd/agents.go

@@ -174,7 +174,7 @@ Fields:
 - version: Config version (always 1)
 - git_dir: Path to git directory (.bare for cloned, .git for initialized)
 - worktree_dir: Directory for worktrees (default: worktrees)
-- main_branch: Primary branch, protected from removal and used as base for new branches (default: main)
+- main_branch: Primary branch, branch ref protected from deletion and used as base for new branches (default: main)
 - editor: Preferred editor binary name (default: auto-detect)
 - setup: Commands run sequentially after creating a worktree
 - parallel_setup: Commands run concurrently after setup completes

cmd/clone.go

@@ -72,17 +72,9 @@ func runClone(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	// Detect the remote's default branch
-	ui.Step("Detecting default branch")
-	detectedBranch, err := runner.GetDefaultBranch(ctx)
-	if err != nil {
-		ui.Warning("Could not detect default branch, defaulting to 'main'")
-		detectedBranch = config.DefaultMainBranch
-	}
-
 	// Create scaffold directories
 	cfg := config.DefaultConfig()
-	cfg.MainBranch = detectedBranch
+	cfg.MainBranch = detectDefaultBranch(ctx, runner)
 	ui.Step("Creating project scaffold")
 	if err := project.CreateScaffold(projectRoot, &cfg, dry); err != nil {
 		return err

cmd/init.go

@@ -53,12 +53,7 @@ func runInit(cmd *cobra.Command, args []string) error {
 	// Detect the repository's default branch
 	gitDir := filepath.Join(projectRoot, cfg.GitDir)
 	initRunner := git.NewRunner(gitDir, dry)
-	detectedBranch, err := initRunner.GetDefaultBranch(cmd.Context())
-	if err != nil {
-		ui.Warning("Could not detect default branch, defaulting to 'main'")
-		detectedBranch = config.DefaultMainBranch
-	}
-	cfg.MainBranch = detectedBranch
+	cfg.MainBranch = detectDefaultBranch(cmd.Context(), initRunner)
 
 	// Create scaffold directories
 	ui.Step("Creating project scaffold")

cmd/project.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"os"
 	"path/filepath"
@@ -63,6 +64,17 @@ func filterManagedWorktrees(worktrees []git.WorktreeInfo, projectRoot string) []
 	return filtered
 }
 
+// detectDefaultBranch asks git for the remote's default branch and falls back
+// to config.DefaultMainBranch on error.
+func detectDefaultBranch(ctx context.Context, runner git.Git) string {
+	branch, err := runner.GetDefaultBranch(ctx)
+	if err != nil {
+		ui.Warning("Could not detect default branch, defaulting to 'main'")
+		return config.DefaultMainBranch
+	}
+	return branch
+}
+
 // resolvePathBest tries to resolve symlinks; falls back to filepath.Clean.
 func resolvePathBest(p string) string {
 	if resolved, err := filepath.EvalSymlinks(p); err == nil {

cmd/remove.go

@@ -39,6 +39,7 @@ func runRemove(cmd *cobra.Command, args []string) error {
 	}
 
 	filtered := filterManagedWorktrees(worktrees, projectRoot)
+	mainBranch := cfg.MainBranchOrDefault()
 
 	if len(filtered) == 0 {
 		return fmt.Errorf("no worktrees found")
@@ -78,11 +79,6 @@ func runRemove(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	// Protect the main branch from accidental removal.
-	if selected.Branch == cfg.MainBranchOrDefault() {
-		return fmt.Errorf("cannot remove the main branch worktree (%s)", selected.Branch)
-	}
-
 	force, _ := cmd.Flags().GetBool("force")
 
 	if !force {
@@ -108,13 +104,22 @@ func runRemove(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	ui.Step("Removing worktree: " + selected.Branch)
+	isMainBranch := selected.Branch == mainBranch
+
+	if isMainBranch {
+		ui.Step("Removing worktree: " + selected.Branch + " (branch preserved in bare repo)")
+	} else {
+		ui.Step("Removing worktree: " + selected.Branch)
+	}
+
 	if err := runner.WorktreeRemove(ctx, selected.Path, force); err != nil {
 		return err
 	}
 
-	if err := runner.BranchDelete(ctx, selected.Branch, false); err != nil {
-		ui.Warning("Could not delete branch: " + err.Error())
+	if !isMainBranch {
+		if err := runner.BranchDelete(ctx, selected.Branch, false); err != nil {
+			ui.Warning("Could not delete branch: " + err.Error())
+		}
 	}
 
 	ui.Success("Removed worktree: " + selected.Branch)

e2e/testdata/add_remove.txtar

@@ -31,3 +31,13 @@ stderr 'Removed worktree'
 # List should show only main
 exec wt list
 stderr 'main'
+
+# Remove the main branch worktree (should succeed, branch preserved)
+exec wt remove main
+stderr 'branch preserved'
+stderr 'Removed worktree'
+! exists worktrees/main
+
+# Re-add the main branch worktree
+exec wt add --skip-setup main
+exists worktrees/main

internal/config/config.go

@@ -126,7 +126,7 @@ func renderAnnotatedConfig(cfg *Config) string {
 		fmt.Fprintf(&b, "shared_dir: %s\n", DefaultSharedDir)
 	}
 
-	b.WriteString("\n# The primary branch of the repository (used as base for new branches, protected from removal)\n")
+	b.WriteString("\n# The primary branch of the repository (used as base for new branches, branch ref protected from deletion)\n")
 	if cfg != nil && cfg.MainBranch != "" {
 		fmt.Fprintf(&b, "main_branch: %s\n", cfg.MainBranch)
 	} else {