Skip to content

Commit 345d6d9

Browse files
husky-7-support Fix bugs. Update readme
1 parent 8d92a18 commit 345d6d9

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.husky/prepare-commit-msg

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
COMMIT_MSG_FILE="${1}"
55

66
if [ -z "$BRANCHES_TO_SKIP" ]; then
7-
BRANCHES_TO_SKIP=(master develop)
7+
BRANCHES_TO_SKIP="master develop"
88
fi
99

1010
BRANCH_NAME="$(git symbolic-ref --short HEAD)"
@@ -13,19 +13,19 @@ BRANCH_NAME="${BRANCH_NAME##*/}"
1313
is_branch_excluded() {
1414
result=0
1515

16-
for branch in ${BRANCHES_TO_SKIP[@]}; do
17-
if [ $branch = $BRANCH_NAME ]; then
16+
for branch in ${BRANCHES_TO_SKIP}; do
17+
if [ "$branch" = "$BRANCH_NAME" ]; then
1818
result=1
1919
fi
2020
done
2121
echo $result
2222
}
2323

2424
is_branch_in_commit_msg() {
25-
echo "$(head -1 $COMMIT_MSG_FILE | grep -c --regexp=^${1}.*$)"
25+
head -1 "$COMMIT_MSG_FILE" | grep -c --regexp=^"${1}".*$
2626
}
2727

28-
if [ -n "$BRANCH_NAME" ] && ! [[ $(is_branch_excluded $BRANCH_NAME) -eq 1 ]] &&
29-
! [[ $(is_branch_in_commit_msg $BRANCH_NAME) -eq 1 ]]; then
30-
sed -i'.bak' -e "1s/^/$BRANCH_NAME /" $COMMIT_MSG_FILE
28+
if [ -n "$BRANCH_NAME" ] && ! [ "$(is_branch_excluded "$BRANCH_NAME")" -eq 1 ] && \
29+
! [ "$(is_branch_in_commit_msg "$BRANCH_NAME")" -eq 1 ]; then
30+
sed -i'.bak' -e "1s~^~${BRANCH_NAME} ~" "$COMMIT_MSG_FILE"
3131
fi

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Example project with prepare-commit-msg hook configured to prepend branch name t
99
## Run
1010

1111
npm install
12-
git checkout -b issue-123
12+
git checkout -b fix/issue-123
1313
touch example.txt
1414
git add .
1515
git commit -m "My new commit"

0 commit comments

Comments
 (0)