Skip to content

Fix PR title and commit message for merge override #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 1 commit into from
Apr 20, 2026
Merged

Fix PR title and commit message for merge override #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions branch-release/branch_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading