ghmerge: The default remote is on github.openssl.org

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/103)

diff --git a/review-tools/README b/review-tools/README
index 3e38c8af1fa078e081be169aec837afe3624b09a..cb443b55d85856b9d9496e16ffe394ed95086161 100644 (file)
--- a/review-tools/README
+++ b/review-tools/README
@@ -113,12 +113,13 @@ It includes several safety precautions and questions such as showing the diff,
 showing the resulting commit messages, and (by default) rebuilding everything.
 
 It works on the current branch, which should be 'master' or one of the stable
-releases. The default remote is the first one matching 'git.openssl.org.*(push)'.
-So typically before calling 'ghmerge' one would have done the following:
+releases. The default remote is the first one matching
+'github.openssl.org:(openssl|omc|otc).*(push)'. So typically before calling
+'ghmerge' one would have done the following:
 
        git remote -v
-origin openssl-git@git.openssl.org:openssl.git (fetch)
-origin openssl-git@git.openssl.org:openssl.git (push)
+origin openssl-git@github.openssl.org:openssl/openssl.git (fetch)
+origin openssl-git@github.openssl.org:openssl/openssl.git (push)
        git fetch origin
        git checkout master
 

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 23b0ae2f14ffd2bb64ea2132b72034b7db6ea7a2..1e96e6ac8a9e9ce45286f16acaba7dc98e8d8bdb 100755 (executable)
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -130,9 +130,9 @@ else
 fi
 ADDREVOPTS=${ADDREVOPTS# } # chop any leading ' '
 
-[ "$REMOTE" = "" ] && REMOTE=`git remote -v | awk '/git.openssl.org.*(push)/{ print $1; }' | head -n 1` # usually this will be 'upstream'
+[ "$REMOTE" = "" ] && REMOTE=`git remote -v | awk '/github.openssl.org:(openssl|omc|otc).*(push)/{ print $1; }' | head -n 1` # usually this will be 'upstream'
 if [ "$REMOTE" = "" ] ; then
-    echo Cannot find git remote with URL including 'git.openssl.org'
+    echo Cannot find git remote with URL including 'github.openssl.org'
     exit 1
 fi