diff --git a/hack/cherry-pick.sh b/hack/cherry-pick.sh index 877a9efd88..f5a2baf6d6 100755 --- a/hack/cherry-pick.sh +++ b/hack/cherry-pick.sh @@ -39,17 +39,20 @@ PULL_REQUESTS=($@) # Check gh authentication echo "+++ Checking gh authentication..." gh auth status +echo +echo "+++ Fetching pull requests..." COMMIT_HASHS=() for pull in "${PULL_REQUESTS[@]}"; do + echo "Fetching pull request #${pull}..." hash="$(gh pr view ${pull} --json mergeCommit --jq .mergeCommit.oid)" COMMIT_HASHS+=($hash) done +echo function join { local IFS="$1"; shift; echo "$*"; } -PULL_DASH=$(join - "${PULL_REQUESTS[@]/#/#}") PULL_SUBJ=$(join " " "${PULL_REQUESTS[@]/#/#}") -NEWBRANCH="cherry-pick-${PULL_DASH}-to-${BRANCH}" +NEWBRANCH="cherry-pick-to-${BRANCH}-$(date +%s)" # Update all remote branches echo "+++ Updating remote branches..." @@ -95,7 +98,7 @@ echo # Create a pull request echo "+++ Creating a pull request..." -pull_title="Cherry-pick ${PULL_SUBJ}" +pull_title="Cherry-pick to ${BRANCH}" pull_body=$(cat <