Use pre-push hook instead of pre-commit hook

Author: Apeiros-46B

.gitignore

@@ -150,8 +150,8 @@ src/config
 # codespell dictionary
 scripts/dictionary/
 
-# time marker for pre-commit hook to check if staged files have been formatted
-scripts/.last_format_time
+# marker files for pre-commit and pre-push hooks to check if staged files have been formatted
+scripts/.format_markers/
 
 # clangd for nvim lsp
 src/.clangd

scripts/githooks/pre-commit

@@ -5,12 +5,15 @@ filter_formattable_files() {
 }
 
 toplevel="$(git rev-parse --show-toplevel)"
-mtime=$(stat -c %Y "$toplevel/scripts/.last_format_time" 2> /dev/null || echo 0)
+marker="$toplevel/scripts/.format_markers/$(git rev-parse --abbrev-ref HEAD)"
+mtime=$(stat -c %Y "$marker" 2> /dev/null || echo 0)
 
 git diff --staged --name-only | filter_formattable_files | while read -r file; do
     if [ $mtime -lt "$(stat -c %Y "$toplevel/$file")" ]; then
-        # last format invocation was before staged changes
-        echo "Please run $toplevel/scripts/lint_and_format.sh before committing!" 1>&2
-        exit 1
+        # The file was modified AFTER formatting. Remove the marker to tell the pre-push hook
+        # that this commit introduces unformatted code.
+        rm -f "$marker" 2> /dev/null
+        echo "Warning: Code is unformatted."
+        break
     fi
 done

scripts/githooks/pre-push

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+confirm() {
+    read -r -p "$1 [y/N] " response < /dev/tty
+    case "$response" in
+        [yY][eE][sS]|[yY])
+            return 0
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+scriptsdir="$(git rev-parse --show-toplevel)/scripts"
+
+if ! [ -f "$scriptsdir/.format_markers/$(git rev-parse --abbrev-ref HEAD)" ]; then
+    echo "Warning: Code is unformatted. Please run $scriptsdir/lint_and_format.sh."
+    if confirm 'Continue without formatting?'; then
+        echo "Continuing push anyway."
+        exit 0
+    else
+        echo "Aborting push."
+        exit 1
+    fi
+fi
+
+# vim:ts=4 et

scripts/lint_and_format.sh

@@ -149,7 +149,10 @@ run_eof_new_line
 run_git_diff_check
 run_ansible_lint
 
-# Update time marker so pre-commit git hook knows that code has been formatted
-touch "$CURR_DIR/.last_format_time"
+# Update markers, telling Git hooks that formatting has been done
+# (Per-branch, so switching branches doesn't confuse the hooks)
+branch="$(git rev-parse --abbrev-ref HEAD)"
+mkdir -p "$CURR_DIR/.format_markers/$(dirname "$branch")"
+touch "$CURR_DIR/.format_markers/${branch}"
 
 exit 0