Update tools scripts to know about 3.0

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/92)

diff --git a/review-tools/opensslpull b/review-tools/opensslpull
index 0c8a40baa1aad481e283dbcf28072e9b2be7aba2..d8b97c6a906740df6b958e0afbcefc7bd471f773 100755 (executable)
--- a/review-tools/opensslpull
+++ b/review-tools/opensslpull
@@ -9,6 +9,7 @@ test -f ./config || {
 git checkout --quiet OpenSSL_1_0_2-stable ; git pull --rebase
 git checkout --quiet OpenSSL_1_1_0-stable ; git pull --rebase
 git checkout --quiet OpenSSL_1_1_1-stable ; git pull --rebase
+git checkout --quiet openssl-3.0 ; git pull --rebase
 git checkout --quiet master
 git rebase -p origin/master
 
@@ -17,6 +18,9 @@ for B in `git branch | fgrep -v '*'` ; do
     OpenSSL*-stable)
         echo "        skipping $B"
         ;;
+    openssl-*)
+        echo "        skipping $B"
+        ;;
     *)
         # If .skiplist exists and this branch is listed, don't rebase
         if test -f .skiplist && grep -q "$B" .skiplist ; then

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index a5dd427cce8569acbbc29c013ab672644d5ef517..c446763a4601fdaf45a58b23da36d81af95d0e83 100755 (executable)
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -28,6 +28,9 @@ case $b in
 *1*1*1*)
     branch=OpenSSL_1_1_1-stable
     ;;
+*3*0*)
+    branch=openssl-3.0
+    ;;
 m*)
     branch=master
     ;;