[openssl-commits] [tools] master update

[Rich Salz]

The branch master has been updated
       via  8d677266c077c4cd43fad2b814dc9ecbac4727d7 (commit)
      from  22592d8f89f7a2aad00ab36a38ee698840bf258c (commit)


- Log -----------------------------------------------------------------
commit 8d677266c077c4cd43fad2b814dc9ecbac4727d7
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Jul 26 10:29:35 2017 +1000

    Modifications to pick-to-branch script.
    
    Change the mid-exit to a yes/no to continue or abort loop.
    Change "git co" to "git checkout".

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

Summary of changes:
 review-tools/pick-to-branch | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index 374b5e5..9160ef5 100755
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -12,7 +12,7 @@ case $# in
     b=$1
     ;;
 *)
-    echo Usage $0 "[commitid] branch"
+    echo "Usage $0 [commitid] branch"
     exit 1
     ;;
 esac
@@ -36,11 +36,29 @@ m*)
     exit 1
     ;;
 esac
-exec echo id,b $id $branch
 
-echo $branch
-git co --quiet master || exit 1
-git co $branch || exit 1
+echo "id is $id"
+echo "branch is $branch"
+echo "Are these correct?"
+
+while true
+do
+    echo -n "Enter YES to continue or NO to abort: "
+    read x
+    x="`echo $x | tr A-Z a-z`"
+    if [ "$x" = "y" -o "$x" = "yes" -o "$x" = "n" -o "$x" = "no" ]
+    then
+        break
+    fi
+done
+
+if [ "$x" = "n" -o "$x" = "no" ]
+then
+    exit 1
+fi
+
+git checkout --quiet master || exit 1
+git checkout $branch || exit 1
 git cherry-pick -e -x $id
 
 while true
@@ -59,4 +77,4 @@ then
     git push
 fi
 
-git co master
+git checkout master