Skip to content

Commit 0818950

Browse files
committed
fix branch naming
1 parent ed113c5 commit 0818950

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

engine/internal/srv/branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (s *Server) createBranch(w http.ResponseWriter, r *http.Request) {
139139
return
140140
}
141141

142-
branchPointer, ok := branches[models.BranchName(fsm.Pool().Name, createRequest.BranchName)]
142+
branchPointer, ok := branches[models.BranchName(fsm.Pool().Name, createRequest.BaseBranch)]
143143
if !ok {
144144
api.SendBadRequestError(w, r, "base branch not found")
145145
return

engine/pkg/models/branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ type BranchView struct {
4242

4343
// BranchName returns full branch name.
4444
func BranchName(pool, branch string) string {
45-
return pool + "_" + branch
45+
return pool + "|" + branch
4646
}

0 commit comments

Comments
 (0)