From dd36bc6f181ee8d4c27f0aa93775cef3c52be314 Mon Sep 17 00:00:00 2001 From: bchanot Date: Tue, 6 Oct 2026 11:38:56 +0200 Subject: [PATCH] chore(githooks): refresh post-commit/post-merge from the lib (hook label) --- .githooks/post-commit | 3 ++- .githooks/post-merge | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.githooks/post-commit b/.githooks/post-commit index ad605ea..417fecf 100755 --- a/.githooks/post-commit +++ b/.githooks/post-commit @@ -1,5 +1,6 @@ #!/bin/sh # gitflow post-commit — generated by gitflow_init. Do not hand-edit. +hook=post-commit # Pushes every commit as it lands (BDR-095): a remote only backs up what it # holds. Never fails the commit: no origin / offline / refused → warning only. # Opt out for one command with GITFLOW_NO_PUSH=1 (throwaway repos, tests). @@ -10,6 +11,6 @@ git remote get-url origin >/dev/null 2>&1 || exit 0 br=$(git symbolic-ref --short -q HEAD 2>/dev/null) || exit 0 # detached HEAD — nothing to track if command -v timeout >/dev/null 2>&1; then t="timeout ${GITFLOW_PUSH_TIMEOUT:-30}"; else t=""; fi if $t git push -q -u --follow-tags origin "$br" >/dev/null 2>&1; then exit 0; fi -echo "gitflow post-commit: push of '$br' FAILED — this commit exists only on this disk." >&2 +echo "gitflow $hook: push of '$br' FAILED — this commit exists only on this disk." >&2 echo " Push by hand: git push -u origin $br (rejected as non-fast-forward? never force-push; ask first)" >&2 exit 0 diff --git a/.githooks/post-merge b/.githooks/post-merge index 0456217..69a9f65 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -1,5 +1,6 @@ #!/bin/sh # gitflow post-merge — generated by gitflow_init. Do not hand-edit. +hook=post-merge # Pushes every commit as it lands (BDR-095): a remote only backs up what it # holds. Never fails the commit: no origin / offline / refused → warning only. # Opt out for one command with GITFLOW_NO_PUSH=1 (throwaway repos, tests). @@ -10,6 +11,6 @@ git remote get-url origin >/dev/null 2>&1 || exit 0 br=$(git symbolic-ref --short -q HEAD 2>/dev/null) || exit 0 # detached HEAD — nothing to track if command -v timeout >/dev/null 2>&1; then t="timeout ${GITFLOW_PUSH_TIMEOUT:-30}"; else t=""; fi if $t git push -q -u --follow-tags origin "$br" >/dev/null 2>&1; then exit 0; fi -echo "gitflow post-commit: push of '$br' FAILED — this commit exists only on this disk." >&2 +echo "gitflow $hook: push of '$br' FAILED — this commit exists only on this disk." >&2 echo " Push by hand: git push -u origin $br (rejected as non-fast-forward? never force-push; ask first)" >&2 exit 0