From b30adac4651a04b94caecfd55e0dfa5255406f3a Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 15 Oct 2023 09:05:15 +0100 Subject: [PATCH] fix: check-mailmap has problems with log.showSignature true Fixes #111 log.showSignature true shows additional signature information. This patch removes the detailed information. --- pre_commit_hooks/check-mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pre_commit_hooks/check-mailmap b/pre_commit_hooks/check-mailmap index 20999fe..ec4601e 100755 --- a/pre_commit_hooks/check-mailmap +++ b/pre_commit_hooks/check-mailmap @@ -24,7 +24,7 @@ check_email() { # How we want it to appear How it appears in git commit # # See git-shortlog(1) for more details. - output="$(! git 2>&1 log --use-mailmap --pretty='%aN %aE' | tr '[:upper:]' '[:lower:]' | sort -u | awk '{print $NF}' | sort | uniq -c | sed -e 's/^[ \t]*//' | grep -v '^1[[:space:]]' | awk '{print $NF}')" + output="$(! git 2>&1 -c log.showSignature=false log --use-mailmap --pretty='%aN %aE' | tr '[:upper:]' '[:lower:]' | sort -u | awk '{print $NF}' | sort | uniq -c | sed -e 's/^[ \t]*//' | grep -v '^1[[:space:]]' | awk '{print $NF}')" if [ -n "${output}" ]; then RC=1 @@ -43,4 +43,4 @@ check_email() { } main -exit ${RC} +exit "${RC}"