diff options
Diffstat (limited to 'scripts/maint/pre-push')
| -rwxr-xr-x | scripts/maint/pre-push | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/maint/pre-push b/scripts/maint/pre-push index 2cf1837b8d..26c48c4e21 100755 --- a/scripts/maint/pre-push +++ b/scripts/maint/pre-push @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # git pre-push hook script to prevent "fixup!" and "squash!" commit # from ending up in master, or in any branch if CUR_BRANCH check is removed. @@ -10,7 +10,8 @@ z40=0000000000000000000000000000000000000000 CUR_BRANCH=$(git rev-parse --abbrev-ref HEAD) -if [ "$CUR_BRANCH" != "master" ] +if [ "$CUR_BRANCH" != "master" ] && [[ $CUR_BRANCH != release-* ]] && + [[ $CUR_BRANCH != maint-* ]] then exit 0 fi |