forked from bchanot/claude
bastien
32d8f981df
Since BDR-095 `start` sets an auto-pushed upstream, so `git branch -d` checked "merged into origin/<branch>" (always true, the post-commit hook keeps it in sync) instead of "merged into develop". T22a proves it: an unmerged feature with its upstream in sync is deleted by `-d` alone. - `gitflow_delete` is the single delete path (finish + CLI `delete`): refuses main/develop (rc 6) and any branch that is not an ancestor of develop or main (rc 5, `gitflow_merged_into_base`, fail closed when neither base exists), then `-d` as a second layer. CLI `merged`, `hooks`. - Fourth generated hook `reference-transaction`: in the `prepared` call, a deletion of refs/heads/main or refs/heads/develop exits 1, whatever issued it (branch -d/-D, update-ref -d, rename, script, sub-agent). `git config gitflow.protect false` opts a foreign clone out. - `GITFLOW_HOOKS` is the one hook list: write/emit/reconcile, T19d and doctor.sh (`gitflow.sh hooks`) read it. `.githooks/` and `githooks/` regenerated with the fourth hook. - settings.json: static deny on hand `git branch -d/--delete/-dr/-rd` and on renames of main/develop; hard_deny "Branch deletion by hand"; the Disarming entry covers all four hooks and `gitflow.*` config; the protected-branches environment line states the rule. - Doctrine (CLAUDE.global.md gitflow section), gitflow SKILL (`delete` op, rc 5/6 rows, common mistake), guard-bash spec T8w flips to deny, SETTINGS.md, README, CHANGELOG. - Tests: T22 (12) lib guard incl. the premise proof, T23 (11) hook; T19 covers the fourth hook. 152/154, the 2 failures are the pre-existing T16a (gitleaks absent on this host).
16 lines
829 B
Bash
Executable File
16 lines
829 B
Bash
Executable File
#!/bin/sh
|
|
# gitflow reference-transaction — generated by gitflow_init. Do not hand-edit.
|
|
# Refuses deleting (or renaming) main / develop, whatever the
|
|
# command. Mirrors gitflow_protected_base (lib/gitflow.sh).
|
|
[ "$1" = prepared ] || exit 0
|
|
while read -r _old new ref; do
|
|
case "$ref" in refs/heads/main|refs/heads/develop) ;; *) continue ;; esac
|
|
case "$new" in *[!0]*) continue ;; esac # new value not all-zeros → an update, not a deletion
|
|
# Per-repo opt-out (a foreign clone): git config gitflow.protect false
|
|
[ "$(git config --bool --default true gitflow.protect)" = false ] && exit 0
|
|
echo "gitflow reference-transaction: BLOCKED — deleting '$ref', a protected base." >&2
|
|
echo " main and develop are never deleted or renamed. A merged working branch: gitflow.sh delete <branch>" >&2
|
|
exit 1
|
|
done
|
|
exit 0
|