ghmerge: Automatically detect remote only if not explicitly given as option

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index b2bb071863737dd7d350c0b934968d0233fa6ef9..35ac8f82c11fd4426f75620ff88f8212b6e875e0 100755 (executable)
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -7,11 +7,7 @@ BUILD=yes
 INTERACTIVE=yes
 AUTOSQUASH="--autosquash"
 [ -z ${CC+x} ] && CC="ccache gcc" # the default otherwise is "ccache clang-3.6"
-REMOTE=`git remote -v | awk '/git.openssl.org.*(push)/{ print $1; }' | head -n 1`
-if [ "$REMOTE" = "" ] ; then
-    echo Cannot find git remote with URL including 'git.openssl.org'
-    exit 1
-fi
+REMOTE=""
 REL=""
 
 if [ ! -d .git ] ; then
@@ -89,6 +85,12 @@ while [ $# -ne 0 ]; do
 done
 ADDREVOPTS=${ADDREVOPTS# } # chop any leading ' '
 
+[ "$REMOTE" = "" ] && REMOTE=`git remote -v | awk '/git.openssl.org.*(push)/{ print $1; }' | head -n 1`
+if [ "$REMOTE" = "" ] ; then
+    echo Cannot find git remote with URL including 'git.openssl.org'
+    exit 1
+fi
+
 if [ "$PRNUM" = "" -o "$TEAM" = "" ] ; then
     echo "Usage: $0 [flags, including addrev options] prnum reviewer..."
     exit 1