Merge branch 'each-replay-merge' into 'main'

revise branch format

See merge request isc-projects/bind9!7719

.gitlab/issue_templates/Release.md

@@ -46,7 +46,7 @@
  - [ ] ***(QA)*** Update BIND 9 version in `configure.ac` (9.18+) or `version` (9.16).
  - [ ] ***(QA)*** Rebuild `configure` using Autoconf on `docs.isc.org` (9.16).
  - [ ] ***(QA)*** Update GitLab settings for all maintained branches to disallow merging to them.
- - [ ] ***(QA)*** Tag the releases in the private repository (`git tag -s -m "BIND 9.x.y" v9_x_y`).
+ - [ ] ***(QA)*** Tag the releases in the private repository (`git tag -s -m "BIND 9.x.y" v9.x.y`).
 
 ### Before the ASN Deadline (for ASN Releases) or the Public Release Date (for Regular Releases)
 

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}"