Fix cherrypicker when the fork is not named the same as the repo #20826
Conversation
k8s-ci-robot
added
cncf-cla: yes
k8s-ci-robot
added
area/prow
|
Looks good to me, thank you for fixing this! |
k8s-ci-robot
added
the
do-not-merge/hold
k8s-ci-robot
added
lgtm
| @@ -556,7 +556,7 @@ func (s *Server) ensureForkExists(org, repo string) (string, error) { | |||
| fork := s.botUser.Login + "/" + repo | |||
|
|
|||
| // fork repo if it doesn't exsit | |||
| if _, err := s.ghc.EnsureFork(s.botUser.Login, org, repo); err != nil { | |||
| if repo, err := s.ghc.EnsureFork(s.botUser.Login, org, repo); err != nil { | |||
There was a problem hiding this comment.
The only case in which this code will use the name from EnsureFork is if there was an error in which case we don't do anything anyways, this doesn't address Steves comment at all
There was a problem hiding this comment.
I suggest you write some tests for this method to be confident your changes do what you think they do
There was a problem hiding this comment.
Done. Thanks for the feedback
mpherman2
force-pushed
the
cherrypicker_fix
branch
from
df30e9b
to
9a2ae14
Compare
k8s-ci-robot
added
size/M
mpherman2
force-pushed
the
cherrypicker_fix
branch
from
9a2ae14
to
7838946
Compare
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alvaroaleman, chaodaiG, mpherman2 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
If the fork name was not the same as the repo name, we were not returning the right value for ensureForkExists