From 45774ae80773dbb6794c95d2ad31823c76f6d441 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Mon, 20 Apr 2026 11:11:46 -0700 Subject: [PATCH] Fix PR title and commit message for merge override --- branch-release/branch_release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/branch-release/branch_release.sh b/branch-release/branch_release.sh index d49a7ab..24d08c3 100755 --- a/branch-release/branch_release.sh +++ b/branch-release/branch_release.sh @@ -317,10 +317,11 @@ esac if [ -n "${FORCED_TARGET_RELEASE:-}" ]; then - TARGET_BRANCH=release${FORCED_TARGET_RELEASE}-SNAPSHOT + NEXT_RELEASE=${FORCED_TARGET_RELEASE} + TARGET_BRANCH=release${NEXT_RELEASE}-SNAPSHOT if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then echo "" - echo "Overriding default merge forward target with '${TARGET_BRANCH}'. Merging ${TAG} to it." + echo "Overriding default merge forward target with '${TARGET_BRANCH}'. Merging tag ${TAG} to it." MERGE_BRANCH="${FORCED_TARGET_RELEASE}_fb_bot_merge_${RELEASE_NUM}" else echo "The created tag '${TAG}' specified an invalid target release override: ${TARGET_BRANCH}." >&2