Fix release script (#20707)

This commit is contained in:
Luke Heath 2024-07-25 10:38:16 -07:00 committed by GitHub
parent 6a31d4eb44
commit a270b6d44a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -849,7 +849,7 @@ if [[ "$failed" == "false" ]]; then
echo "DRYRUN: Would have switched back to branch $target_branch"
fi
if [[ "$minor" == "false" ]]; then
if [[ "$dry_run" = "false" && "$minor" == "false" ]]; then
# Cherry-pick from update-changelog-branch
ch_commit=$(git log -n 1 --pretty=format:"%H" $update_changelog_branch)
git cherry-pick $ch_commit