The branch master has been updated via ed247a7778c7a043f726f862e9544c963fd22e83 (commit) from f39ecd88bc71cdb4332ec42b12405abf3738bde2 (commit)
- Log ----------------------------------------------------------------- commit ed247a7778c7a043f726f862e9544c963fd22e83 Author: Pauli <pa...@openssl.org> Date: Wed Sep 1 09:08:21 2021 +1000 Update tools scripts to know about 3.0 Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/tools/pull/92) ----------------------------------------------------------------------- Summary of changes: review-tools/opensslpull | 4 ++++ review-tools/pick-to-branch | 3 +++ 2 files changed, 7 insertions(+) diff --git a/review-tools/opensslpull b/review-tools/opensslpull index 0c8a40b..d8b97c6 100755 --- 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 a5dd427..c446763 100755 --- 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 ;;