From a270b6d44adfcdbdacc4791ee1d5602a18b871c4 Mon Sep 17 00:00:00 2001
From: Luke Heath <luke@fleetdm.com>
Date: Thu, 25 Jul 2024 10:38:16 -0700
Subject: [PATCH] Fix release script (#20707)

---
 tools/release/publish_release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/release/publish_release.sh b/tools/release/publish_release.sh
index 81503d79a8..ea15c37499 100755
--- a/tools/release/publish_release.sh
+++ b/tools/release/publish_release.sh
@@ -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