Merge pull request #57 from igdianov/main

fix(pr): reset base branch name for each rule url
jenkins-x-plugins · Oct 21, 2022 · f9dcec6 · f9dcec6
2 parents fe357a6 + c8771b9
commit f9dcec6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/cmd/pr/pr.go b/pkg/cmd/pr/pr.go
@@ -138,6 +138,8 @@ func (o *Options) Run() error {
 		}
 	}
 
+	BaseBranchName := o.BaseBranchName
+
 	for i := range o.UpdateConfig.Spec.Rules {
 		rule := &o.UpdateConfig.Spec.Rules[i]
 		err = o.FindURLs(rule)
@@ -165,6 +167,8 @@ func (o *Options) Run() error {
 
 			// lets clear the branch name so we create a new one each time in a loop
 			o.BranchName = ""
+			// lets reset the base branch name each time in a loop to avoid side effects when reusing pull requests
+			o.BaseBranchName = BaseBranchName
 
 			source := ""
 			details := &scm.PullRequest{