Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion review-tools/ghmerge
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ fi
TARGET_REPO=$(jq -r '.base.repo.name' $PR_URL_CONTENTS)
RTM_LABEL=$(jq -r '.labels[] | select(.name == "approval: ready to merge") | .name' $PR_URL_CONTENTS)
URGENT_LABEL=$(jq -r '.labels[] | select(.name == "severity: urgent") | .name' $PR_URL_CONTENTS)
HOLD_LABEL=$(jq -r '.labels[] | select(.name|test("hold*")) | .name' $PR_URL_CONTENTS)

if [ "$TARGET_REPO" != "openssl" ]
then
Expand All @@ -207,9 +208,12 @@ elif [ -z "$RTM_LABEL" -a -z "$URGENT_LABEL" ]
then
>&2 echo "This PR has neither the ready to merge or urgent label set, can't merge"
exit 1
elif [ -n "$HOLD_LABEL" ]
then
>&2 echo "This PR has hold label, can't merge"
exit 1
fi


ORIG_REF=`git rev-parse --abbrev-ref HEAD` # usually this will be 'master'
STASH_OUT=`git stash`
WORK="copy-of-${WHO}-${BRANCH}"
Expand Down