fix: Update the parent HEAD even if rebasing is not needed (#109)

e2e_tests/stack_sync_delete_parent_test.go

@@ -0,0 +1,63 @@
+package e2e_tests
+
+import (
+	"testing"
+
+	"github.com/aviator-co/av/internal/meta"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/aviator-co/av/internal/git"
+	"github.com/aviator-co/av/internal/git/gittest"
+	"github.com/stretchr/testify/require"
+)
+
+func TestStackSyncDeleteParent(t *testing.T) {
+	repo := gittest.NewTempRepo(t)
+	Chdir(t, repo.Dir())
+
+	// To start, we create a simple two-stack where each stack has a single commit.
+	// Our stack looks like:
+	//     stack-1: main -> 1a -> 2b
+	//     stack-2:                \ -> 2a -> 2b
+	//     stack-3:	                           \ -> 3a -> 3b
+	require.Equal(t, 0, Cmd(t, "git", "checkout", "-b", "stack-1").ExitCode)
+	gittest.CommitFile(t, repo, "my-file", []byte("1a\n"), gittest.WithMessage("Commit 1a"))
+	gittest.CommitFile(t, repo, "my-file", []byte("1a\n1b\n"), gittest.WithMessage("Commit 1b"))
+	RequireAv(t, "stack", "branch", "stack-2")
+	gittest.CommitFile(t, repo, "my-file", []byte("1a\n1b\n2a\n"), gittest.WithMessage("Commit 2a"))
+	gittest.CommitFile(t, repo, "my-file", []byte("1a\n1b\n2a\n2b\n"), gittest.WithMessage("Commit 2b"))
+	RequireAv(t, "stack", "branch", "stack-3")
+	gittest.CommitFile(t, repo, "my-file", []byte("1a\n1b\n2a\n2b\n3a\n"), gittest.WithMessage("Commit 3a"))
+	gittest.CommitFile(t, repo, "my-file", []byte("1a\n1b\n2a\n2b\n3a\n3b\n"), gittest.WithMessage("Commit 3b"))
+
+	// Everything up to date now, so this should be a no-op.
+	require.Equal(t, 0, Av(t, "stack", "sync", "--no-fetch", "--no-push").ExitCode)
+
+	// We simulate the stack-2 is deleted and submerged into stack-1
+	//     main:    X
+	//     stack-1:  \ -> 1a -> 1b -> 2a -> 2b
+	var newStack1Head string
+	gittest.WithCheckoutBranch(t, repo, "stack-1", func() {
+		RequireCmd(t, "git", "merge", "--ff-only", "stack-2")
+		RequireCmd(t, "git", "branch", "-D", "stack-2")
+
+		var err error
+		newStack1Head, err = repo.RevParse(&git.RevParse{Rev: "HEAD"})
+		require.NoError(t, err, "failed to get HEAD")
+	})
+	RequireAv(t, "stack", "tidy")
+	RequireAv(t, "stack", "sync", "--no-fetch", "--no-push")
+
+	assert.Equal(t, 0,
+		Cmd(t, "git", "merge-base", "--is-ancestor", newStack1Head, "stack-3").ExitCode,
+		"stack-1 should be an ancestor of stack-3 after running sync",
+	)
+	assert.Equal(t,
+		meta.BranchState{
+			Name: "stack-1",
+			Head: newStack1Head,
+		},
+		GetStoredParentBranchState(t, repo, "stack-3"),
+		"stack-3 should be re-rooted onto stack-1",
+	)
+}

internal/actions/sync_branch.go

@@ -321,6 +321,9 @@ func syncBranchRebase(
 			"  - already up-to-date with parent ", colors.UserInput(parentState.Name),
 			"\n",
 		)
+		branch.Parent = parentState
+		branch.Parent.Head = parentHead
+		tx.SetBranch(branch)
 		return &SyncBranchResult{git.RebaseResult{Status: git.RebaseAlreadyUpToDate}, nil, branch}, nil
 	}