bchanot
472cccbc52
Run D1 of manual-push mode (BDR-114). `git config --bool --default true
gitflow.autopush` only covered a MISSING key: an unparseable value made
git die with empty output, the `= false` test failed, and every push ran
again. A typo on a work machine silently re-enabled the pushes it was
meant to stop.
- lib/gitflow.sh: `_gitflow_push_off` reads the mode through the lib
verb (`push-mode`); anything but `auto` is push-off, and the verb's
stderr line names an invalid value during start/finish.
- Emitted post-commit/post-merge hooks (POSIX sh, standalone): push only
when the key reads `true` or is unset; `false` exits quietly; any
other result prints one stderr line ("NOT pushed, treated as manual
push mode") and exits 0. Mirrors gitflow_push_mode.
- .githooks/ and githooks/ regenerated files-only through `emit-hook`
(no config read or write; .git/config hash unchanged).
- hooks/unpushed-guard.sh: mode from the lib verb (absolute lib path
resolved before any cd, no temp file); anything but auto is manual;
the SessionStart line names an invalid or unreadable value.
- Tests: gitflow-test T18q block (invalid → start, hook and finish push
nothing and say so; `true` → the hook pushes; emitted hook is
POSIX-clean), unpushed-guard T14 rewritten.
96 lines
4.3 KiB
Bash
Executable File
96 lines
4.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# hooks/unpushed-guard.sh — SessionStart + Stop: surface work that exists on
|
||
# this disk only (BDR-095). The 21/09 wipe cost four days of commits that had
|
||
# never left the machine; the post-commit hook now pushes every commit, so a
|
||
# branch ahead of its upstream is a real signal (push refused, offline, hook
|
||
# not installed), not noise.
|
||
#
|
||
# Non-blocking by contract: a systemMessage for the user, never a decision.
|
||
# SessionStart also reports uncommitted changes (a dead session leaves some
|
||
# behind); Stop reports unpushed commits only, since a dirty tree mid-work is
|
||
# the normal state at a turn end.
|
||
#
|
||
# Manual-push mode (git config gitflow.autopush false, human-set): unpushed
|
||
# work is expected, so Stop stays silent; SessionStart gives one info line
|
||
# counting every local branch, with the branches to push by hand. An
|
||
# unparseable value is treated as manual too (fail closed, BDR-114); the mode
|
||
# comes from the lib verb, the one reader the hooks share.
|
||
set -u
|
||
|
||
# Resolved before any cd: the hook may be invoked by a relative path.
|
||
_lib="$(cd "$(dirname "${BASH_SOURCE[0]}")/../lib" 2>/dev/null && pwd)/gitflow.sh"
|
||
payload=$(cat 2>/dev/null)
|
||
field() { printf '%s' "$payload" | jq -r "$1 // empty" 2>/dev/null; }
|
||
event=$(field '.hook_event_name')
|
||
cwd=$(field '.cwd'); [ -n "$cwd" ] || cwd=$PWD
|
||
cd "$cwd" 2>/dev/null || exit 0
|
||
git rev-parse --is-inside-work-tree >/dev/null 2>&1 || exit 0
|
||
br=$(git symbolic-ref --short -q HEAD 2>/dev/null) || exit 0
|
||
|
||
# The verb writes its stderr line BEFORE its stdout word: the last line is the mode.
|
||
out=$(bash "$_lib" push-mode 2>&1); mode=${out##*$'\n'}
|
||
mode_err=${out%"$mode"}; mode_err=${mode_err%$'\n'}
|
||
manual=0; [ "$mode" = auto ] || manual=1 # fail closed: anything but auto
|
||
[ "$manual" = 1 ] && [ "$event" != SessionStart ] && exit 0 # BDR-087: info at start only
|
||
|
||
# Local branches holding commits no remote has, one per line.
|
||
ahead_branches() {
|
||
local b
|
||
while IFS= read -r b; do
|
||
[ "$(git rev-list --count "$b" --not --remotes 2>/dev/null)" -gt 0 ] && echo "$b"
|
||
done < <(git for-each-ref --format='%(refname:short)' refs/heads)
|
||
}
|
||
|
||
# Manual mode: commits on every local branch that no remote holds.
|
||
manual_clause() {
|
||
local n list first
|
||
n=$(git rev-list --count --branches --not --remotes 2>/dev/null || echo 0)
|
||
[ "$n" -gt 0 ] || return 0
|
||
if ! git remote get-url origin >/dev/null 2>&1; then
|
||
echo "no 'origin' remote, $n commit(s) on this disk only"
|
||
return
|
||
fi
|
||
list=$(ahead_branches); first=$(printf '%s\n' "$list" | head -n 1)
|
||
echo "$n commit(s) not on origin ($(printf '%s' "$list" | paste -sd, - | sed 's/,/, /g')), push by hand: git push -u origin $first"
|
||
}
|
||
|
||
# Commits that no remote holds, as one clause; empty when everything is pushed.
|
||
unpushed_clause() {
|
||
local up n
|
||
[ "$manual" = 1 ] && { manual_clause; return; }
|
||
if ! git remote get-url origin >/dev/null 2>&1; then
|
||
echo "no 'origin' remote, every commit lives on this disk only"
|
||
return
|
||
fi
|
||
if up=$(git rev-parse --abbrev-ref --symbolic-full-name '@{u}' 2>/dev/null); then
|
||
n=$(git rev-list --count "$up..HEAD" 2>/dev/null || echo 0)
|
||
[ "$n" -gt 0 ] && echo "$n commit(s) on '$br' not on $up, push: git push"
|
||
else
|
||
# commits no remote-tracking ref holds: the ones only this disk has
|
||
n=$(git rev-list --count HEAD --not --remotes 2>/dev/null || echo 0)
|
||
echo "'$br' has no upstream ($n commit(s) on this disk only), push: git push -u origin $br"
|
||
fi
|
||
}
|
||
|
||
msg=$(unpushed_clause)
|
||
if [ "$event" = "SessionStart" ]; then
|
||
dirty=$(git status --porcelain 2>/dev/null | wc -l | tr -d ' ')
|
||
[ "$dirty" -gt 0 ] && msg="${msg:+$msg; }$dirty uncommitted change(s) in $cwd"
|
||
fi
|
||
if [ "$event" = "SessionStart" ]; then
|
||
case "$mode" in
|
||
invalid) msg="${msg:+$msg; }${mode_err#gitflow.sh push-mode: } — treated as manual push mode (nothing pushes); fix the value by hand" ;;
|
||
manual|auto) ;;
|
||
*) msg="${msg:+$msg; }push mode unreadable (lib verb printed '${mode:-nothing}') — treated as manual push mode" ;;
|
||
esac
|
||
fi
|
||
[ -n "$msg" ] || exit 0
|
||
|
||
if [ "$manual" = 1 ]; then msg="ℹ manual push mode: $msg"; else msg="⚠ unpushed work: $msg"; fi
|
||
if [ "$event" = "SessionStart" ]; then
|
||
jq -cn --arg m "$msg" \
|
||
'{systemMessage: $m, hookSpecificOutput: {hookEventName: "SessionStart", additionalContext: $m}}'
|
||
else
|
||
jq -cn --arg m "$msg" '{systemMessage: $m}'
|
||
fi
|