@rabbitio/ui-kit 1.0.0-beta.53 → 1.0.0-beta.55

package/.husky/commit-msg

@@ -1,19 +1,10 @@
 #!/bin/sh
 # Hook script to ensure commit messages end with 'task_id=[a-zA-Z0-9]+'
 
-# TODO: The added skips did not work for some reasons, so I commented them out. To be fixed.
-
-# 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
+# Check if the commit message starts with "Merge"
+if grep -qE '^Merge branch' "$1"; then
+    exit 0
+fi
 
 # Fail regular commits without task_id in the end
 COMMIT_REGEXP='task_id=[,a-zA-Z0-9]+$'