Sfoglia il codice sorgente

HUE-8888 [ci] Allow rebase commit message in pull requests

The merge commit won't show up after the merge as it is disabled
in the repo options.
Romain 5 anni fa
parent
commit
aa45633e79
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  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]+\))"
+PATTERN="^(HUE\-[a-z0-9]+ \[.+\] .+)|(\[.+\] .+? \(#[a-z0-9]+\)|(Merge branch 'master' into master))"
 
 if ! [[ "$START_LINE" =~ $PATTERN ]]; then
   echo "'$START_LINE' is not a valid commit message, please see for examples:"