Skip to content

K
k3s
Unverified Commit 0b15620e authored by Davanum Srinivas's avatar Davanum Srinivas
Browse files
Options

tolerate both http(s) and git urls for cherry_pick_pull

Looks like the previous change broke for users who have cloned their upstream using https instead of ssh. Here we explicit strip out the prefixes like "http://", "https://" and "git@" before look for the repo name and the org name. Change-Id: I8fbfae8bfa209a954d36d3ada791dcf13070ec6d
parent f6b54f79
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/cherry_pick_pull.sh
View file @ 0b15620e
...@@ -34,8 +34,8 @@ DRY_RUN=${DRY_RUN:-""} ...@@ -34,8 +34,8 @@ DRY_RUN=${DRY_RUN:-""}
REGENERATE_DOCS=${REGENERATE_DOCS:-""} REGENERATE_DOCS=${REGENERATE_DOCS:-""}
UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream} UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream}
FORK_REMOTE=${FORK_REMOTE:-origin} FORK_REMOTE=${FORK_REMOTE:-origin}
MAIN_REPO_ORG=${MAIN_REPO_ORG:-$(git remote get-url "$UPSTREAM_REMOTE" | awk -F'[@:./]' 'NR==1{print $4}')} MAIN_REPO_ORG=${MAIN_REPO_ORG:-$(git remote get-url "$UPSTREAM_REMOTE" | awk '{gsub(/http[s]:\/\/|git@/,"")}1' | awk -F'[@:./]' 'NR==1{print $3}')}
MAIN_REPO_NAME=${MAIN_REPO_NAME:-$(git remote get-url "$UPSTREAM_REMOTE" | awk -F'[@:./]' 'NR==1{print $5}')} MAIN_REPO_NAME=${MAIN_REPO_NAME:-$(git remote get-url "$UPSTREAM_REMOTE" | awk '{gsub(/http[s]:\/\/|git@/,"")}1' | awk -F'[@:./]' 'NR==1{print $4}')}
if [[ -z ${GITHUB_USER:-} ]]; then if [[ -z ${GITHUB_USER:-} ]]; then
echo "Please export GITHUB_USER=<your-user> (or GH organization, if that's where your fork lives)" echo "Please export GITHUB_USER=<your-user> (or GH organization, if that's where your fork lives)"
......
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