@rabbitio/ui-kit 1.0.0-beta.48 → 1.0.0-beta.49

package/.husky/commit-msg

@@ -1,7 +1,20 @@
 #!/bin/sh
 # Hook script to ensure commit messages end with 'task_id=[a-zA-Z0-9]+'
-COMMIT_REGEXP='task_id=[,a-zA-Z0-9]+$'
 
+# Ignore merge commits, formatted like this: "Merge branch 'one-branch' into another-branch."
+MERGE_COMMIT_REGEXP="^Merge branch '.*' into .*"
+if echo "$1" | grep -qE "$MERGE_COMMIT_REGEXP"; then
+    exit 0
+fi
+
+# Ignore version increases, formatted like this: "Version increase."
+VERSION_INCREASE_REGEXP="^Version increase\.$"
+if echo "$1" | grep -qE "$VERSION_INCREASE_REGEXP"; then
+    exit 0
+fi
+
+# Fail regular commits without task_id in the end
+COMMIT_REGEXP='task_id=[,a-zA-Z0-9]+$'
 if ! grep -qE "$COMMIT_REGEXP" "$1"; then
     echo "ERROR: Commit message doesn't end with task_id"
     exit 1