diff --git a/hack/cherry_pick_pull.sh b/hack/cherry_pick_pull.sh index a2e9ad0a3c35..41ba6b6145be 100755 --- a/hack/cherry_pick_pull.sh +++ b/hack/cherry_pick_pull.sh @@ -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 @@ -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