Explorar o código

HUE-9477 [ci] Allow rebase on master in Pull Requests

e.g. Merge branch 'master' into hue_issue_1270'

The merge commit will disappear in the squash merge as not allowed.
Romain %!s(int64=5) %!d(string=hai) anos
pai
achega
69b8b662b0
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      tools/githooks/commit-msg

+ 1 - 1
tools/githooks/commit-msg

@@ -2,7 +2,7 @@
 
 INPUT_FILE=$1
 START_LINE=${2:-`head -n1 $INPUT_FILE`}
-PATTERN="^(HUE\-[a-z0-9]+ \[.+\] .+)|(\[.+\] .+? \(#[a-z0-9]+\)|(Merge branch 'master' into master))"
+PATTERN="^(HUE\-[a-z0-9]+ \[.+\] .+)|(\[.+\] .+? \(#[a-z0-9]+\)|(Merge branch 'master' into .+))"
 
 if ! [[ "$START_LINE" =~ $PATTERN ]]; then
   echo "'$START_LINE' is not a valid commit message, please see for examples:"