[tor-commits] [tor/master] Also disallow fixup/squash commits in maint-* and release-*

[nickm@xxxxxxxxxxxxxx]

commit b2053cfc44f4876a52f8d71f2308077c6e39498d
Author: rl1987 <rl1987@xxxxxxxxxxxxxxxx>
Date:   Tue Nov 20 16:37:30 2018 +0200

    Also disallow fixup/squash commits in maint-* and release-*
---
 scripts/maint/pre-push | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/pre-push b/scripts/maint/pre-push
index 2cf1837b8..26c48c4e2 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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits