Skip to content

Commit

Permalink
Merge pull request #110632 from Kartik494/fix_cherry_pick
Browse files Browse the repository at this point in the history
Update cherry_pick_pull.sh
  • Loading branch information
k8s-ci-robot committed Jun 26, 2022
2 parents d2c5779 + 23f7594 commit f4abde9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hack/cherry_pick_pull.sh
Expand Up @@ -180,7 +180,7 @@ for pull in "${PULLS[@]}"; do
(git status --porcelain | grep ^U) || echo "!!! None. Did you git am --continue?"
echo
echo "+++ Please resolve the conflicts in another window (and remember to 'git add / git am --continue')"
read -p "+++ Proceed (anything but 'y' aborts the cherry-pick)? [y/n] " -r
read -p "+++ Proceed (anything other than 'y' aborts the cherry-pick)? [y/n] " -r
echo
if ! [[ "${REPLY}" =~ ^[yY]$ ]]; then
echo "Aborting." >&2
Expand Down Expand Up @@ -247,7 +247,7 @@ echo "+++ I'm about to do the following to push to GitHub (and I'm assuming ${FO
echo
echo " git push ${FORK_REMOTE} ${NEWBRANCHUNIQ}:${NEWBRANCH}"
echo
read -p "+++ Proceed (anything but 'y' aborts the cherry-pick)? [y/n] " -r
read -p "+++ Proceed (anything other than 'y' aborts the cherry-pick)? [y/n] " -r
if ! [[ "${REPLY}" =~ ^[yY]$ ]]; then
echo "Aborting." >&2
exit 1
Expand Down

0 comments on commit f4abde9

Please sign in to comment.