Skip to content

Validate staged Go blobs in pre-commit gofmt check and include renames #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JordanCoin merged 2 commits into from
Mar 27, 2026
Merged

Validate staged Go blobs in pre-commit gofmt check and include renames #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e2704a
Fix pre-commit gofmt check to validate staged blobs
JordanCoin Mar 26, 2026
856ba83
fix: address review comments on pre-commit hook
JordanCoin Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions .githooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,45 @@
#!/bin/sh
# Pre-commit hook: run gofmt on staged Go files
# Pre-commit hook: run gofmt on staged Go file blobs (not working tree).

STAGED_GO=$(git diff --cached --name-only --diff-filter=ACM | grep '\.go$')
STAGED_GO=$(git diff --cached --name-only --diff-filter=ACMR -- '*.go')

if [ -z "$STAGED_GO" ]; then
exit 0
fi

UNFORMATTED=$(echo "$STAGED_GO" | xargs gofmt -l 2>/dev/null)
UNFORMATTED=""

if [ -n "$UNFORMATTED" ]; then
echo "gofmt required on:"
echo "$UNFORMATTED"
echo "$STAGED_GO" | while IFS= read -r file; do
[ -z "$file" ] && continue

orig=$(mktemp "${TMPDIR:-/tmp}/gofmt.orig.XXXXXX") || continue
formatted=$(mktemp "${TMPDIR:-/tmp}/gofmt.fmt.XXXXXX") || { rm -f "$orig"; continue; }

if ! git show ":$file" >"$orig" 2>/dev/null; then
rm -f "$orig" "$formatted"
continue
fi

cp "$orig" "$formatted"
if ! gofmt -w "$formatted" >/dev/null 2>&1; then
rm -f "$orig" "$formatted"
continue
fi

if ! cmp -s "$orig" "$formatted"; then
echo "$file" >> "${TMPDIR:-/tmp}/gofmt-unformatted.$$"
fi

rm -f "$orig" "$formatted"
done

RESULT_FILE="${TMPDIR:-/tmp}/gofmt-unformatted.$$"
if [ -f "$RESULT_FILE" ]; then
echo "gofmt required on staged content:"
cat "$RESULT_FILE"
echo ""
echo "Run: gofmt -w $UNFORMATTED"
echo "Run: gofmt -w <files> && git add <files>"
rm -f "$RESULT_FILE"
exit 1
fi
rm -f "$RESULT_FILE"
Loading