From 0fa32f63600273264154d728c89f3dd969d6a9bb Mon Sep 17 00:00:00 2001 From: Rudi C Date: Mon, 18 Jul 2016 22:44:41 -0400 Subject: [PATCH 1/2] Make clear where cherrypick PRs are being created I spent a whole hour troubleshooting all sorts of auth issues today, until I noticed that it was trying to make a PR on my personal account, while the fork is actually on my company's GH organization account. --- hack/cherry_pick_pull.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/cherry_pick_pull.sh b/hack/cherry_pick_pull.sh index 83a200f1628..d21822c4a7f 100755 --- a/hack/cherry_pick_pull.sh +++ b/hack/cherry_pick_pull.sh @@ -29,7 +29,7 @@ declare -r STARTINGBRANCH=$(git symbolic-ref --short HEAD) declare -r REBASEMAGIC="${KUBE_ROOT}/.git/rebase-apply" if [[ -z ${GITHUB_USER:-} ]]; then - echo "Please export GITHUB_USER=" + echo "Please export GITHUB_USER= (or GH organization if that's where your fork lives)" exit 1 fi @@ -139,7 +139,7 @@ gitamcleanup=false function make-a-pr() { 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 # https://github.com/github/hub/issues/976 Otherwise stdin is stolen From d35848b8c8ce1c1a57bd5eb348a2b7c2c7f082be Mon Sep 17 00:00:00 2001 From: Rudi C Date: Mon, 18 Jul 2016 22:47:10 -0400 Subject: [PATCH 2/2] Update cherry_pick_pull.sh --- hack/cherry_pick_pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/cherry_pick_pull.sh b/hack/cherry_pick_pull.sh index d21822c4a7f..520d02b3ee9 100755 --- a/hack/cherry_pick_pull.sh +++ b/hack/cherry_pick_pull.sh @@ -29,7 +29,7 @@ declare -r STARTINGBRANCH=$(git symbolic-ref --short HEAD) declare -r REBASEMAGIC="${KUBE_ROOT}/.git/rebase-apply" if [[ -z ${GITHUB_USER:-} ]]; then - echo "Please export GITHUB_USER= (or GH organization if that's where your fork lives)" + echo "Please export GITHUB_USER= (or GH organization, if that's where your fork lives)" exit 1 fi