Skip to content
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

Jump to bottom

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

Merged
merged 1 commit into from
Aug 30, 2024
Merged

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

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
6 changes: 5 additions & 1 deletion .evergreen/github_app/backport-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
Loading