]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
revise branch format
authorEvan Hunt <each@isc.org>
Thu, 23 Mar 2023 21:05:03 +0000 (14:05 -0700)
committerEvan Hunt <each@isc.org>
Fri, 24 Mar 2023 20:46:34 +0000 (20:46 +0000)
backport branches are now called "bind-9.x" instead of "v9_x".

util/git-replay-merge.sh

index 5ffab6a05a32c9b236b9daf46443c80679c32624..a888593793b708db737a2097e2a597b57d16c36a 100755 (executable)
@@ -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}"