GODRIVER-3314 Fix handling of failed cherry-pick (#482)

mongodb-labs · Aug 30, 2024 · 16cbeae · 16cbeae
1 parent 6b1e892
commit 16cbeae
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.evergreen/github_app/backport-pr.sh b/.evergreen/github_app/backport-pr.sh
@@ -60,7 +60,11 @@ echo "Creating the cherry-pick..."
 old_title=$(git --no-pager log $target_sha --pretty=%B | head -n 1)
 title="${old_title} [${target_branch}]"
 body="Cherry-pick of $target_sha to $target_branch"
-if git cherry-pick -x -m1 $target_sha; then
+status=0
+git cherry-pick -x -m1 $target_sha || {
+    status=$?
+}
+if [ $status == 0 ]; then
     # If the cherry-pick succeeds, push the branch and make a PR.
     echo "Creating the cherry-pick..."
     echo "Creating the PR..."