summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2019-07-29 11:33:38 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2019-07-30 09:51:41 +1200
commit1386aefe98db03a9b54ca065c41e63ffc96db489 (patch)
tree3d9adc993a28a2f6cadb680d661c6ff890f7f697
parenta62d60fc3741aa5eaeccaaa562afda624c3e8a04 (diff)
downloadopenembedded-core-contrib-1386aefe98db03a9b54ca065c41e63ffc96db489.tar.gz
openembedded-core-contrib-1386aefe98db03a9b54ca065c41e63ffc96db489.tar.bz2
openembedded-core-contrib-1386aefe98db03a9b54ca065c41e63ffc96db489.zip
scripts/create-pull-request: improve handling of non-SSH remote URLs
When attempting to create a pull request, we look at the remote URL in order to extract information to include in the cover letter. However, the assumption was that the remote is an SSH URL i.e. containing '@' which is not always the case (the pull and push URLs might be different, or we might be pushing via https) - if it wasn't the script just gave up leaving you to manually edit the URLs in the email. With a few minor tweaks to the regexes the script will work for these cases as well. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rwxr-xr-xscripts/create-pull-request20
1 files changed, 6 insertions, 14 deletions
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 3ce03d6c1a..762828fd9a 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -123,20 +123,12 @@ fi
# Rewrite private URLs to public URLs
# Determine the repository name for use in the WEB_URL later
-case "$REMOTE_URL" in
-*@*)
- USER_RE="[A-Za-z0-9_.@][A-Za-z0-9_.@-]*\$\?"
- PROTO_RE="[a-z][a-z+]*://"
- GIT_RE="\(^\($PROTO_RE\)\?$USER_RE@\)\([^:/]*\)[:/]\(.*\)"
- REMOTE_URL=${REMOTE_URL%.git}
- REMOTE_REPO=$(echo $REMOTE_URL | sed "s#$GIT_RE#\4#")
- REMOTE_URL=$(echo $REMOTE_URL | sed "s#$GIT_RE#git://\3/\4#")
- ;;
-*)
- echo "WARNING: Unrecognized remote URL: $REMOTE_URL"
- echo " The pull and browse URLs will likely be incorrect"
- ;;
-esac
+USER_RE="[A-Za-z0-9_.@][A-Za-z0-9_.@-]*\$\?"
+PROTO_RE="[a-z][a-z+]*://"
+GIT_RE="\(^\($PROTO_RE\)\?\)\($USER_RE@\)\?\([^:/]*\)[:/]\(.*\)"
+REMOTE_URL=${REMOTE_URL%.git}
+REMOTE_REPO=$(echo $REMOTE_URL | sed "s#$GIT_RE#\5#")
+REMOTE_URL=$(echo $REMOTE_URL | sed "s#$GIT_RE#git://\4/\5#")
if [ -z "$BRANCH" ]; then
BRANCH=$(git branch | grep -e "^\* " | cut -d' ' -f2)