From: Evan Hunt <each@isc.org>
Date: Thu, 23 Mar 2023 21:05:03 +0000 (-0700)
Subject: revise branch format
X-Git-Tag: v9.19.12~65^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e9fce7a0217a710ba436434d01d0d79ed5018ca;p=thirdparty%2Fbind9.git

revise branch format

backport branches are now called "bind-9.x" instead of "v9_x".
---

diff --git a/util/git-replay-merge.sh b/util/git-replay-merge.sh
index 5ffab6a05a3..a888593793b 100755
--- a/util/git-replay-merge.sh
+++ b/util/git-replay-merge.sh
@@ -179,9 +179,8 @@ resume() {
 	LABEL_VERSION=""
 	LABEL_BACKPORT=""
 
-	if ! $DONT_TAG && [[ $TARGET_BRANCH == v9_[0-9][0-9] ]]; then
-
-		version="9.${TARGET_BRANCH#v9_}"
+	if ! $DONT_TAG && [[ $TARGET_BRANCH == bind-9.[0-9][0-9] ]]; then
+		version="${TARGET_BRANCH#bind-}"
 
 		TITLE="$(git show --format=%b ${SOURCE_COMMIT} | head -n 1)"
 		TITLE="merge_request.title=[${version}] ${TITLE}"