Merge pull request #4 from mikhailsidorov/husky-7-support

husky-7-support Fix bugs. Update readme

.husky/prepare-commit-msg

@@ -4,7 +4,7 @@
 COMMIT_MSG_FILE="${1}"
 
 if [ -z "$BRANCHES_TO_SKIP" ]; then
-  BRANCHES_TO_SKIP=(master develop)
+  BRANCHES_TO_SKIP="master develop"
 fi
 
 BRANCH_NAME="$(git symbolic-ref --short HEAD)"
@@ -13,19 +13,19 @@ BRANCH_NAME="${BRANCH_NAME##*/}"
 is_branch_excluded() {
   result=0
 
-  for branch in ${BRANCHES_TO_SKIP[@]}; do
-    if [ $branch = $BRANCH_NAME ]; then
+  for branch in ${BRANCHES_TO_SKIP}; do
+    if [ "$branch" = "$BRANCH_NAME" ]; then
       result=1
     fi
   done
   echo $result
 }
 
 is_branch_in_commit_msg() {
-  echo "$(head -1 $COMMIT_MSG_FILE | grep -c --regexp=^${1}.*$)"
+  head -1 "$COMMIT_MSG_FILE" | grep -c --regexp=^"${1}".*$
 }
 
-if [ -n "$BRANCH_NAME" ] && ! [[ $(is_branch_excluded $BRANCH_NAME) -eq 1 ]] &&
-  ! [[ $(is_branch_in_commit_msg $BRANCH_NAME) -eq 1 ]]; then
-  sed -i'.bak' -e "1s/^/$BRANCH_NAME /" $COMMIT_MSG_FILE
+if [ -n "$BRANCH_NAME" ] && ! [ "$(is_branch_excluded "$BRANCH_NAME")" -eq 1 ] && \
+! [ "$(is_branch_in_commit_msg "$BRANCH_NAME")" -eq 1 ]; then
+  sed -i'.bak' -e "1s~^~${BRANCH_NAME} ~" "$COMMIT_MSG_FILE"
 fi

README.md

@@ -9,7 +9,7 @@ Example project with prepare-commit-msg hook configured to prepend branch name t
 ## Run
 
     npm install
-    git checkout -b issue-123
+    git checkout -b fix/issue-123
     touch example.txt
     git add .
     git commit -m "My new commit"