Merge pull request #98 from AlexNPavel/extra-backport-logging

server: don't backport to parent branch
openshift-eng · Jul 8, 2024 · db7b7ad · db7b7ad
2 parents 1a02549 + cd70513
commit db7b7ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/jira-lifecycle-plugin/server.go b/cmd/jira-lifecycle-plugin/server.go
@@ -2006,7 +2006,9 @@ func handleBackport(e event, gc githubClient, jc jiraclient.Client, repoOptions
 	sort.Strings(existingBranches)
 	existingBranchesSet := sets.New(existingBranches...)
 	for _, branch := range existingBranches {
-		cherrypickBranches += fmt.Sprintf("\n/cherrypick %s", branch)
+		if branch != e.baseRef {
+			cherrypickBranches += fmt.Sprintf("\n/cherrypick %s", branch)
+		}
 		if _, ok := repoOptions[branch]; !ok {
 			continue
 		}

diff --git a/cmd/jira-lifecycle-plugin/server_test.go b/cmd/jira-lifecycle-plugin/server_test.go
@@ -2994,7 +2994,6 @@ Instructions for interacting with me using PR comments are available [here](http
 /cherrypick v2
 /cherrypick v3
 /cherrypick v4
-/cherrypick v5
 
 <details>