diff options
| author | Craig Jennings <c@cjennings.net> | 2026-05-22 14:54:44 -0500 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-05-22 14:54:44 -0500 |
| commit | bf1c57d7b9f750af68cb74a2f6fc1477ad7f0e44 (patch) | |
| tree | 4ff8d0fd222c2c38e94214bdac99cee9418476e7 /scripts/audit.sh | |
| parent | 6efa7f13b7e901e8909e5edc652d0bc9b2a2d3df (diff) | |
| download | rulesets-bf1c57d7b9f750af68cb74a2f6fc1477ad7f0e44.tar.gz rulesets-bf1c57d7b9f750af68cb74a2f6fc1477ad7f0e44.zip | |
docs(commands): fix finish-branch base detection and merge safety
Two audit fixes. Base-branch detection returned a merge-base SHA where a branch name was needed. Phase 2 now resolves the branch name (open PR base, then origin/HEAD, then ask) and computes the merge-base SHA separately. Option 1's merge gained pre-flight safety: a dirty-tree refusal with no auto-stash, protected-branch awareness, an upstream-gated ff-only pull, and merge-commit-vs-rebase as a team-policy choice. Worktree detection moved from grepping branch names to a git-dir vs git-common-dir comparison.
Diffstat (limited to 'scripts/audit.sh')
0 files changed, 0 insertions, 0 deletions