Skip to content

K
k3s
Commit e5c85891 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29160 from therc/patch-2

Automatic merge from submit-queue Make clear where cherrypick PRs are being created
parents 1014b350 d35848b8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/cherry_pick_pull.sh
View file @ e5c85891
...@@ -29,7 +29,7 @@ declare -r STARTINGBRANCH=$(git symbolic-ref --short HEAD) ...@@ -29,7 +29,7 @@ declare -r STARTINGBRANCH=$(git symbolic-ref --short HEAD)
declare -r REBASEMAGIC="${KUBE_ROOT}/.git/rebase-apply" declare -r REBASEMAGIC="${KUBE_ROOT}/.git/rebase-apply"
if [[ -z ${GITHUB_USER:-} ]]; then if [[ -z ${GITHUB_USER:-} ]]; then
echo "Please export GITHUB_USER=<your-user>" echo "Please export GITHUB_USER=<your-user> (or GH organization, if that's where your fork lives)"
exit 1 exit 1
fi fi
...@@ -139,7 +139,7 @@ gitamcleanup=false ...@@ -139,7 +139,7 @@ gitamcleanup=false
function make-a-pr() { function make-a-pr() {
local rel="$(basename "${BRANCH}")" local rel="$(basename "${BRANCH}")"
echo "+++ Creating a pull request on github" echo "+++ Creating a pull request on GitHub at ${GITHUB_USER}:${NEWBRANCH}"
# This looks like an unnecessary use of a tmpfile, but it avoids # This looks like an unnecessary use of a tmpfile, but it avoids
# https://github.com/github/hub/issues/976 Otherwise stdin is stolen # https://github.com/github/hub/issues/976 Otherwise stdin is stolen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment