Skip to content

Commit 45774ae

Browse files
committed
Fix PR title and commit message for merge override
1 parent 5746ca7 commit 45774ae

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

branch-release/branch_release.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,11 @@ esac
317317

318318

319319
if [ -n "${FORCED_TARGET_RELEASE:-}" ]; then
320-
TARGET_BRANCH=release${FORCED_TARGET_RELEASE}-SNAPSHOT
320+
NEXT_RELEASE=${FORCED_TARGET_RELEASE}
321+
TARGET_BRANCH=release${NEXT_RELEASE}-SNAPSHOT
321322
if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then
322323
echo ""
323-
echo "Overriding default merge forward target with '${TARGET_BRANCH}'. Merging ${TAG} to it."
324+
echo "Overriding default merge forward target with '${TARGET_BRANCH}'. Merging tag ${TAG} to it."
324325
MERGE_BRANCH="${FORCED_TARGET_RELEASE}_fb_bot_merge_${RELEASE_NUM}"
325326
else
326327
echo "The created tag '${TAG}' specified an invalid target release override: ${TARGET_BRANCH}." >&2

0 commit comments

Comments
 (0)