Merge branch 'master' into fix/macos-daemon-tgz

zowe · May 2, 2024 · b2ed039 · b2ed039
2 parents 9ec5f9c + 65d4aa9
commit b2ed039
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -2,7 +2,7 @@
 . "$(dirname "$0")/_/husky.sh"
 
 # If not a merge commit, require commit to be signed off
-if [ ! -e .git/MERGE_MSG ] && ! grep -q "^Signed-off-by: " "$1"; then
+if [ ! -e $(git rev-parse --git-dir)/MERGE_MSG ] && ! grep -q "^Signed-off-by: " "$1"; then
   echo >&2 "Commit message must be signed off with your user name and email."
   echo >&2 "To sign off your commit, add the -s flag to the git commit command."
   exit 1