Skip to content

Commit f5a95c7

Browse files
committed
fix(external-plugins/cherrypicker): fix head branch format when skipFork
is enabled
1 parent aee3e5a commit f5a95c7

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

cmd/external-plugins/cherrypicker/server.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,10 @@ func (s *Server) handle(logger logrus.FieldLogger, requester string, comment *gi
567567
resp := fmt.Sprintf("failed to push cherry-picked changes in GitHub: %v", err)
568568
return utilerrors.NewAggregate([]error{err, s.createComment(logger, org, repo, num, comment, resp)})
569569
}
570+
head := fmt.Sprintf("%s:%s", s.botUser.Login, newBranch)
571+
if s.skipFork {
572+
head = newBranch
573+
}
570574

571575
// Open a PR in GitHub.
572576
var cherryPickBody string
@@ -575,7 +579,6 @@ func (s *Server) handle(logger logrus.FieldLogger, requester string, comment *gi
575579
} else {
576580
cherryPickBody = cherrypicker.CreateCherrypickBody(num, "", releaseNoteFromParentPR(body), chainBranches)
577581
}
578-
head := fmt.Sprintf("%s:%s", s.botUser.Login, newBranch)
579582
createdNum, err := s.ghc.CreatePullRequest(org, repo, title, cherryPickBody, head, targetBranch, true)
580583
if err != nil {
581584
logger.WithError(err).Warn("failed to create new pull request")

0 commit comments

Comments
 (0)