Skip to content

Commit 3143f89

Browse files
authored
fix: Fix vs code merges
Fixes #35
1 parent 5ae9b3c commit 3143f89

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

commit-msg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ fi
88
commitTitle="$(cat $1 | head -n1)"
99

1010
# ignore merge requests
11-
if echo "$commitTitle" | grep -qE "^Merge branch \'"; then
11+
if echo "$commitTitle" | grep -qE "Merge branch"; then
1212
echo "Commit hook: ignoring branch merge"
1313
exit 0
1414
fi
1515

1616
# check semantic versioning scheme
17-
if ! echo "$commitTitle" | grep -qE '^(?:feat|fix|docs|style|refactor|perf|test|chore)\(?(?:\w+|\s|\-|_)?\)?:\s\w+'; then
17+
if ! echo "$commitTitle" | grep -qE '^(?:|feat|fix|docs|style|refactor|perf|test|chore)\(?(?:\w+|\s|\-|_)?\)?:\s\w+'; then
1818
echo "Your commit title did not follow semantic versioning: $commitTitle"
1919
echo "Please see https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#commit-message-format"
2020
exit 1

0 commit comments

Comments
 (0)