diff --git a/pre-commit b/pre-commit index e84341d..e59b2b8 100755 --- a/pre-commit +++ b/pre-commit @@ -3,8 +3,11 @@ set +eou pipefail size_limit=$((5 * 2**20)) # make sure we have at least 1 commit in the repo # so we don't fail on the first commit -test "$(git rev-list --count HEAD 2>/dev/null)" -gt 1 2> /dev/null > /dev/null || \ - gitleaks protect --verbose --redact --staged && exit 0 +if [ "$(git rev-list --count HEAD 2>/dev/null)" -lt 2 2> /dev/null > /dev/null ]; then + gitleaks protect --staged --verbose --no-banner --no-color + exit 0 +fi + repo_root=$(git rev-parse --show-toplevel) pushd $repo_root 2>/dev/null > /dev/null @@ -32,4 +35,5 @@ if $hasLargeFile; then exit 1 fi popd $repo_root 2>/dev/null > /dev/null || true -gitleaks protect --verbose --redact --staged +gitleaks protect --staged --verbose --no-banner --no-color 2>/dev/null + diff --git a/pre-push b/pre-push index c816b3e..43fe336 100755 --- a/pre-push +++ b/pre-push @@ -27,6 +27,6 @@ which mg >/dev/null 2> /dev/null || { echo >&2 "\nThis repository is configured for mg but 'mg' was not found on your path. Install it with go install github.com/taigrr/mg/cmd/mg@latest or remove this code from your templates in ~/.config/git/hooks.\n"; exit 2; } && mg register >/dev/null & -test $(git lfs track | wc -l) -gt 0 || exit 0 +test "$(git lfs track | wc -l)" -gt 0 || exit 0 command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting '.git/hooks/pre-push' and your templates in ~/.config/git/hooks.\n"; exit 2; } git lfs pre-push "$@"