Skip to content
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

For checkout/activate, when given a commitID, fetch the branch it belongs to. #2912

Merged
merged 1 commit into from
Nov 30, 2023
Merged

For checkout/activate, when given a commitID, fetch the branch it belongs to. #2912

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
13 changes: 13 additions & 0 deletions internal/runbits/checkout/checkout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,19 @@ func (r *Checkout) Run(ns *project.Namespaced, branchName, cachePath, targetPath
return "", locale.WrapError(err, "err_fetch_branch", "", branchName)
}
commitID = branch.CommitID
} else {
// It's possible the given commitID does not belong to the default project branch.
// If so, find the correct branch.
for _, branch := range pj.Branches {
belongs, err := model.CommitBelongsToBranch(ns.Owner, ns.Project, branch.Label, *commitID)
if err != nil {
return "", errs.Wrap(err, "Could not determine if the given commitID belongs to a project branch")
}
if belongs {
branchName = branch.Label
break
}
}
}

if commitID == nil {
Expand Down
Loading