fetch trunk if missing locally

Author: skarim

cmd/add_test.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
@@ -593,22 +594,32 @@ func TestAdd_AdoptExistingBranchWithoutCommonBaseFails(t *testing.T) {
 
 func TestAdd_InitializesStackWithExplicitBranch(t *testing.T) {
 	gitDir := t.TempDir()
-	var createdBranch, createdBase, checkedOut string
+	trunkExists := false
+	var created [][2]string
+	var checkedOut string
 	restore := git.SetOps(&git.MockOps{
 		GitDirFn:          func() (string, error) { return gitDir, nil },
 		CurrentBranchFn:   func() (string, error) { return "unstacked", nil },
 		DefaultBranchFn:   func() (string, error) { return "main", nil },
 		IsRerereEnabledFn: func() (bool, error) { return true, nil },
+		BranchExistsFn:    func(name string) bool { return name == "main" && trunkExists },
+		RevParseFn: func(ref string) (string, error) {
+			if ref == "main" && !trunkExists {
+				return "", fmt.Errorf("unknown revision %s", ref)
+			}
+			return "sha-" + ref, nil
+		},
 		CreateBranchFn: func(name, base string) error {
-			createdBranch = name
-			createdBase = base
+			created = append(created, [2]string{name, base})
+			if name == "main" {
+				trunkExists = true
+			}
 			return nil
 		},
 		CheckoutBranchFn: func(name string) error {
 			checkedOut = name
 			return nil
 		},
-		RevParseFn: func(ref string) (string, error) { return "sha-" + ref, nil },
 	})
 	defer restore()
 
@@ -625,8 +636,10 @@ func TestAdd_InitializesStackWithExplicitBranch(t *testing.T) {
 
 	require.NoError(t, err)
 	assert.NotContains(t, output, "not part of a stack")
-	assert.Equal(t, "first-layer", createdBranch)
-	assert.Equal(t, "main", createdBase)
+	assert.Equal(t, [][2]string{
+		{"main", "origin/main"},
+		{"first-layer", "main"},
+	}, created)
 	assert.Equal(t, "first-layer", checkedOut)
 
 	sf, loadErr := stack.Load(gitDir)
@@ -684,6 +697,7 @@ func TestAdd_InitializesGeneratedBranchAndCommits(t *testing.T) {
 		CurrentBranchFn:   func() (string, error) { return currentBranch, nil },
 		DefaultBranchFn:   func() (string, error) { return "main", nil },
 		IsRerereEnabledFn: func() (bool, error) { return true, nil },
+		BranchExistsFn:    func(name string) bool { return name == "main" },
 		CreateBranchFn: func(name, base string) error {
 			assert.Equal(t, expectedBranch, name)
 			assert.Equal(t, "main", base)

cmd/init.go

@@ -106,6 +106,22 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 		}
 	}
 
+	// The repository's default branch may only exist on the remote if the
+	// initial local branch was renamed before starting the stack.
+	if _, err := git.RevParse(trunk); err != nil {
+		remote, err := pickRemote(cfg, currentBranch, "")
+		if err != nil {
+			if !errors.Is(err, errInterrupt) {
+				cfg.Errorf("failed to resolve remote: %s", err)
+			}
+			return ErrSilent
+		}
+		if err := ensureLocalTrunk(cfg, trunk, remote); err != nil {
+			cfg.Errorf("%s", err)
+			return ErrSilent
+		}
+	}
+
 	// --- Flag validation ---
 
 	// --adopt is deprecated; print a notice and continue normally.

cmd/init_test.go

@@ -69,6 +69,67 @@ func TestInit_CustomTrunk(t *testing.T) {
 	assert.Equal(t, "develop", sf.Stacks[0].Trunk.Branch)
 }
 
+func TestInit_RestoresMissingLocalTrunk(t *testing.T) {
+	gitDir := t.TempDir()
+	trunkExists := false
+	var fetchedRemote string
+	var fetchedBranches []string
+	var created [][2]string
+
+	restore := git.SetOps(&git.MockOps{
+		GitDirFn:          func() (string, error) { return gitDir, nil },
+		DefaultBranchFn:   func() (string, error) { return "main", nil },
+		CurrentBranchFn:   func() (string, error) { return "renamed-branch", nil },
+		IsRerereEnabledFn: func() (bool, error) { return true, nil },
+		BranchExistsFn: func(name string) bool {
+			return name == "renamed-branch" || (name == "main" && trunkExists)
+		},
+		ResolveRemoteFn: func(branch string) (string, error) {
+			assert.Equal(t, "renamed-branch", branch)
+			return "origin", nil
+		},
+		FetchBranchesFn: func(remote string, branches []string) error {
+			fetchedRemote = remote
+			fetchedBranches = branches
+			return nil
+		},
+		RevParseFn: func(ref string) (string, error) {
+			if ref == "main" && !trunkExists {
+				return "", fmt.Errorf("unknown revision %s", ref)
+			}
+			return "sha-" + ref, nil
+		},
+		CreateBranchFn: func(name, base string) error {
+			created = append(created, [2]string{name, base})
+			if name == "main" {
+				trunkExists = true
+			}
+			return nil
+		},
+		CheckoutBranchFn: func(string) error { return nil },
+	})
+	defer restore()
+
+	cfg, outR, errR := config.NewTestConfig()
+	err := runInit(cfg, &initOptions{branches: []string{"first-layer"}})
+	output := collectOutput(cfg, outR, errR)
+
+	require.NoError(t, err)
+	assert.Equal(t, "origin", fetchedRemote)
+	assert.Equal(t, []string{"main"}, fetchedBranches)
+	assert.Equal(t, [][2]string{
+		{"main", "origin/main"},
+		{"first-layer", "main"},
+	}, created)
+	assert.Contains(t, output, "Created local trunk branch main from origin/main")
+
+	sf, loadErr := stack.Load(gitDir)
+	require.NoError(t, loadErr)
+	require.Len(t, sf.Stacks, 1)
+	assert.Equal(t, "main", sf.Stacks[0].Trunk.Branch)
+	assert.Equal(t, []string{"first-layer"}, sf.Stacks[0].BranchNames())
+}
+
 func TestInit_AdoptExistingBranches(t *testing.T) {
 	gitDir := t.TempDir()
 	restore := git.SetOps(&git.MockOps{