tidy: speed up pre-commit hook, add pre-push hook

.githooks/pre-commit

@@ -1,53 +1,4 @@
 #!/bin/sh
 
-echo "Running precommit audit..."
-make audit
-
-##
-## An example hook script to verify what is about to be committed.
-## Called by "git commit" with no arguments.  The hook should
-## exit with non-zero status after issuing an appropriate message if
-## it wants to stop the commit.
-##
-## To enable this hook, rename this file to "pre-commit".
-
-#if git rev-parse --verify HEAD >/dev/null 2>&1
-#then
-#	against=HEAD
-#else
-#	# Initial commit: diff against an empty tree object
-#	against=$(git hash-object -t tree /dev/null)
-#fi
-
-## If you want to allow non-ASCII filenames set this variable to true.
-#allownonascii=$(git config --type=bool hooks.allownonascii)
-
-## Redirect output to stderr.
-#exec 1>&2
-
-## Cross platform projects tend to avoid non-ASCII filenames; prevent
-## them from being added to the repository. We exploit the fact that the
-## printable range starts at the space character and ends with tilde.
-#if [ "$allownonascii" != "true" ] &&
-#	# Note that the use of brackets around a tr range is ok here, (it's
-#	# even required, for portability to Solaris 10's /usr/bin/tr), since
-#	# the square bracket bytes happen to fall in the designated range.
-#	test $(git diff --cached --name-only --diff-filter=A -z $against |
-#	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
-#then
-#	cat <<\EOF
-#Error: Attempt to add a non-ASCII file name.
-
-#This can cause problems if you want to work with people on other platforms.
-
-#To be portable it is advisable to rename the file.
-
-#If you know what you are doing you can disable this check using:
-
-#  git config hooks.allownonascii true
-#EOF
-#	exit 1
-#fi
-
-## If there are whitespace errors, print the offending file names and fail.
-#exec git diff-index --check --cached $against --
+echo "Running pre-commit linting..."
+make pre-commit

.githooks/pre-push

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Running pre-push audit..."
+make pre-push

Makefile

@@ -33,24 +33,18 @@ no-dirty:
 tidy:
 	go fmt ./...
 	go mod tidy -v
+	go mod verify
 
-.PHONY: fix
-fix: build
-	go mod tidy -v
-	golangci-lint run --fix
-
+## lint: run linting of src and go mod using std tools and golangci-lint
 .PHONY: lint
 lint:
+	go vet ./...
+	go run honnef.co/go/tools/cmd/staticcheck@latest -f stylish -checks=all,-ST1000,-U1000 ./...
 	golangci-lint run
 
-## audit: run quality control checks
+## audit: run quality control checks (tidy, lints, builds, checks for dep vulns and runs tests)
 .PHONY: audit
-audit: tidy
-	go generate ./...
-	go mod verify
-	go vet ./...
-	golangci-lint run
-	go run honnef.co/go/tools/cmd/staticcheck@latest -f stylish -checks=all,-ST1000,-U1000 ./...
+audit: tidy lint build
 	go run golang.org/x/vuln/cmd/govulncheck@latest ./...
 	go test -buildvcs -vet=off ./...
 
@@ -62,11 +56,6 @@ test: build
 # DEVELOPMENT
 # ==================================================================================== #
 
-## test: run all tests
-# .PHONY: test
-# test:
-# 	go test -v -race -buildvcs ./...
-
 ## clean: remove existing artifcats generated by this makefile (.bin)
 .PHONY: clean
 clean:
@@ -93,3 +82,13 @@ run/live:
 	--ignore '**/*.gen.go' \
 	--ignore '**/mocks/*' \
 	-- make run
+
+# ==================================================================================== #
+# GIT HOOKS
+# ==================================================================================== #
+
+.PHONY: pre-commit
+pre-commit: lint
+
+.PHONY: pre-push
+pre-push: audit