Skip to content

fix: resolve BranchOnto target from git ref, not stored state #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ed-irl wants to merge 1 commit into from
Closed

fix: resolve BranchOnto target from git ref, not stored state #1151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions internal/spice/onto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,22 @@ func (s *Service) BranchOnto(ctx context.Context, req *BranchOntoRequest) error
return fmt.Errorf("lookup branch: %w", err)
}

var ontoHash git.Hash
if req.Onto == s.store.Trunk() {
ontoHash, err = s.repo.PeelToCommit(ctx, req.Onto)
if err != nil {
return fmt.Errorf("resolve trunk: %w", err)
}
} else {
// Non-trunk branches must be tracked.
onto, err := s.LookupBranch(ctx, req.Onto)
if err != nil {
// Verify non-trunk target is tracked.
if req.Onto != s.store.Trunk() {
if _, err := s.LookupBranch(ctx, req.Onto); err != nil {
return fmt.Errorf("lookup onto: %w", err)
}
ontoHash = onto.Head
}

// Always resolve the target from the git ref
// rather than the stored state.
// The stored head may be stale
// if a prior operation in the same transaction
// (e.g. branch onto moving upstack branches)
// modified the target branch's git ref.
ontoHash, err := s.repo.PeelToCommit(ctx, req.Onto)
if err != nil {
return fmt.Errorf("resolve %v: %w", req.Onto, err)
}

// The recorded base hash may be stale if the old base branch
Expand Down
Loading