The branch master has been updated
via 51ba5bc2c18780f94136c71800afc3cf8fd32d40 (commit)
from 6305ba8fded75d8dcc410caae0a22c712228b721 (commit)
- Log -----------------------------------------------------------------
commit 51ba5bc2c18780f94136c71800afc3cf8fd32d40
Author: Tomas Mraz <tm...@fedoraproject.org>
Date: Tue Dec 8 16:51:04 2020 +0100
ghmerge: Pass --tools and --web to addrev
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: David von Oheimb <david.von.ohe...@siemens.com>
(Merged from https://github.com/openssl/tools/pull/80)
-----------------------------------------------------------------------
Summary of changes:
review-tools/ghmerge | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 02ab06e..06f6bfa 100755
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -28,7 +28,7 @@ Examples:
set -o errexit
-WHAT=openssl
+WHAT=""
PICK=no
INTERACTIVE=yes
AUTOSQUASH="--autosquash"
@@ -116,6 +116,12 @@ while [ $# -ne 0 ]; do
;;
esac
done
+
+if [ "$WHAT" = "" ] ; then
+ WHAT="openssl"
+else
+ ADDREVOPTS="$ADDREVOPTS --$WHAT"
+fi
ADDREVOPTS=${ADDREVOPTS# } # chop any leading ' '
[ "$REMOTE" = "" ] && REMOTE=`git remote -v | awk '/git.openssl.org.*(push)/{
print $1; }' | head -n 1` # usually this will be 'upstream'
