From 0b803fc16a11a59b4c9fe8e63798d65260daf33f Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Wed, 9 May 2018 14:30:12 -0700
Subject: [PATCH] contrib: update backport script to reflect stable branch
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Since we now do backports on stable-3.0 and stable-3.1 we have to use
the name of the stable branch in the backport branch name. If we don't
do this we will end up with conflicting branch names.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 contrib/backport_to_stable_branch.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/backport_to_stable_branch.sh b/contrib/backport_to_stable_branch.sh
index afdfd07d3..f7ff9b0d0 100755
--- a/contrib/backport_to_stable_branch.sh
+++ b/contrib/backport_to_stable_branch.sh
@@ -11,7 +11,7 @@ stable_branch=$1
 commit=$2
 bkp_branch_name=$3
 bkp_branch_name_prefix=bkp
-bkp_branch=$bkp_branch_name-$bkp_branch_name_prefix
+bkp_branch=$bkp_branch_name-$bkp_branch_name_prefix-$stable_branch
 
 
 #############
@@ -89,8 +89,8 @@ checkout
 cherry_pick
 push
 create_pr <<MSG
-Backport of ${3}
+Backport of ${3} in $stable_branch
 
-Backport of #${3}
+Backport of #${3} in $stable_branch
 MSG
 cleanup
-- 
2.39.5