From 0c49790fa16bcfa6fd3143582088c114552134b2 Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Fri, 4 Aug 2023 14:37:55 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20prepare-commit?= =?UTF-8?q?-msg=20to=20not=20execute=20when=20rebasing=20(#1827)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/prepare-commit-msg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg index 95f3f449c..6be3600db 100755 --- a/.husky/prepare-commit-msg +++ b/.husky/prepare-commit-msg @@ -4,9 +4,11 @@ COMMIT_MSG_FILE=$1 COMMIT_SOURCE=$2 SHA1=$3 +# Gets the current branch name but if we're in a detached head state, return "HEAD" +BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) -# Don't run commitizen for merge or squash commits -if [ "${COMMIT_SOURCE}" = merge ] || [ "${COMMIT_SOURCE}" = squash ];then +# Don't run commitizen for merge or squash commits, as well as when rebasing +if [ "${COMMIT_SOURCE}" = merge ] || [ "${COMMIT_SOURCE}" = squash ] || [ "${COMMIT_SOURCE}" = "message" -a "${BRANCH_NAME}" = "HEAD" ];then exit 0 fi