From 15c3a76b57275477e403350ea344d294c132b534 Mon Sep 17 00:00:00 2001 From: bchanot Date: Mon, 2 Nov 2026 19:57:49 +0100 Subject: [PATCH] fix(release-candidate): split check and finish calls, stop on any finish failure --- skills/release-candidate/SKILL.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/skills/release-candidate/SKILL.md b/skills/release-candidate/SKILL.md index 3c74165..08e9be5 100644 --- a/skills/release-candidate/SKILL.md +++ b/skills/release-candidate/SKILL.md @@ -88,12 +88,18 @@ the prepped `release/` branch stays as-is for a later run. ### STEP 5 — Finish + tag (main loop) The finish runs HERE: the `ask` rule on `gitflow.sh finish` prompts, and a sub-agent cannot put that prompt to you (BLK-018 option b). +Two separate Bash calls: the branch check runs first, its output is read, +then the finish runs. ```bash git branch --show-current # must print release/, else STOP +``` +```bash bash "$HOME/.claude/lib/gitflow.sh" finish ``` Prompt declined → nothing merged, the release branch kept: say so and STOP. -A merge conflict → STOP, surface it verbatim (a human call). Then, on main: +A merge conflict → STOP, surface it verbatim (a human call). Any other +non-zero exit of `finish` also STOPS before the tag: "finish failed: +surface its output verbatim, do not tag". Then, on main: ```bash git tag -a v main -m "release " ```