[openssl-commits] [tools] master update

[Rich Salz]

The branch master has been updated
       via  c0ba851e324ad25cf4734ea93b22e315a51e5106 (commit)
      from  a3215cfa675b64baaa570f374c55f098479b0df6 (commit)


- Log -----------------------------------------------------------------
commit c0ba851e324ad25cf4734ea93b22e315a51e5106
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon May 21 08:13:07 2018 -0400

    Add --tools flag
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/tools/pull/14)

-----------------------------------------------------------------------

Summary of changes:
 review-tools/ghmerge | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index ea6b0ec..7f00b7c 100755
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -12,6 +12,9 @@ if [ ! -d .git ] ; then
     exit 1
 fi
 
+if [ "$1" = "--tools" ] ; then
+    WHAT=tools ; MERGE=yes ; BUILD=no ; shift
+fi
 if [ "$1" = "--web" ] ; then
     WHAT=web ; MERGE=yes ; BUILD=no ; shift
 fi
@@ -82,6 +85,7 @@ if [ "$MERGE" == "yes" ] ; then
 else
     git rebase $WORK
 fi
+
 # echo Rebuilding
 # opensslbuild |& tail -3