Skip to content

Commit 8966988

Browse files
committed
Fix typo
1 parent 9619c9d commit 8966988

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

github/backportPR.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,17 @@ fi
3030
echo "OK PR is merged."
3131
echo "Checking PR merge commit"
3232
PR_MERGE_COMMIT=$(getJsonItem merge_commit_sha)
33-
echo "OK PR merge status is ${PR_MERGE_COMMIT}"
33+
echo "OK PR merge commit is ${PR_MERGE_COMMIT}"
3434
PR_TITLE=$(getJsonItem title)
3535
PR_BODY=$(getJsonItem body)
3636
PR_OWNER=$(getJsonItem user.login)
3737
PR_REPO=$(getJsonItem head.repo.name)
3838
git clone $PR_CLONE_URL &>/dev/null
3939
pushd ${PR_REPO}
4040
git checkout ${TARGET_BASE_BRANCH} &>/dev/null
41-
git checkout -b backport_$(date +%s)
42-
if !git cherry-pick -x ${PR_MERGE_COMMIT}; then
41+
BRANCH_NAME=backport_$(date +%s)
42+
git checkout -b ${BRANCH_NAME}
43+
if ! git cherry-pick -x ${PR_MERGE_COMMIT}; then
4344
git cherry-pick --abort &>/dev/null || true
4445
echo "Cherry-pick failed! Performing patch method..."
4546
PR_PATCH_URL=$(getJsonItem patch_url)
@@ -60,4 +61,4 @@ git push origin HEAD
6061
if [ ${REVIEWERS:-} = "_OWNER_" ]; then
6162
REVIEWERS=$PR_OWNER
6263
fi
63-
gh pr create --repo $PR_CLONE_URL --title "${PR_TITLE}" --body "${PR_BODY}" --reviewers "${REVIEWERS}" --assignee "${PR_OWNER}" --base "${TARGET_BASE_BRANCH}" --branch HEAD
64+
gh pr create --repo $PR_CLONE_URL -f --reviewer "${REVIEWERS}" --assignee "${PR_OWNER}" --base "${TARGET_BASE_BRANCH}" --head ${BRANCH_NAME}

0 commit comments

Comments
 (0)