[sujal-maheshwari2004]

What was wrong

promptctl promote <file> <from> <to> checked out <to> to commit the prompt, then left it checked out. Running promote acme/a.prompt dev staging from dev left the working copy on staging.

The fix

promote records HEAD before checking out <to>. After the commit it switches back to that branch, or to that commit if HEAD was detached. It switches back even if the commit fails. The write/add/commit steps moved into a small commitFile helper that returns the error instead of exiting, so the switch back still runs. The README's Environments section notes that you stay on your branch.

Tests

New cmd/promptctl/promote_test.go TestPromoteRestoresBranch: it builds a real go-git repo with main/dev/staging, promotes from dev, and checks that HEAD is still dev, the working tree has dev's content, and staging has the promoted content.

Against the old main.go:

--- FAIL: TestPromoteRestoresBranch (0.23s)
    promote_test.go:51: after promote HEAD is staging, want dev (the branch it started on)

Full suite: GOWORK=off go build ./... && go vet ./... && go test ./... gives ok github.com/priompt/cli/cmd/promptctl

Before / after (real run)

Before (main):

$ git branch --show-current
dev
$ promptctl promote acme/a.prompt dev staging
promoted acme/a.prompt onto staging (d697f09b6255)
now on: staging

After:

on: dev
promoted acme/a.prompt onto staging (311d0057c710)
exit=0
now on: dev
311d005 promote acme/a.prompt: dev -> staging
-- detached HEAD at main:
promoted acme/a.prompt onto staging (311d0057c710)
HEAD: c39baab main=c39baab branch=''

Independent of #7 (still open). A local merge of #7 + main + this branch applied cleanly and go test ./... passed.

Fixes #5

🤖 Generated with Claude Code