fix: branch_rename force-updates target ref instead of delete+recreate #335

Merged

jmiller merged 1 commits from fix/promote-rc-force-update into main 2026-07-04 23:26:40 +00:00

Conversation 0 Commits 1 Files Changed 2

+39 -16

jmiller commented 2026-07-04 23:24:33 +00:00

Owner

Copy Link

Copy Source

Summary

cli/branch_rename.php (exposed as the moko repo:rename-branch CLI command, bin/moko:182) renamed a branch by deleting the target and recreating it. When the target is a protected branch (e.g. rc), the delete fails — silently — and the recreate then returns HTTP 409 "branch already exists", so the rename never happens.

Fix

Force-update the target ref in place instead: read the source branch HEAD, and if the target already exists PATCH git/refs/heads/{to} with {sha, force:true}; otherwise create it via POST /branches. php -l clean, phpcs PSR-12 clean.

Context

The auto-release.yml "Promote to RC" job that used to call this script has since been changed to do the rename inline in the workflow (Template-Generic PR #52), so promote-rc no longer depends on this script. This fix remains valuable for the standalone moko repo:rename-branch command, which would otherwise hit the same failure when renaming into a protected branch.

Both paths require the caller's token to have force-push permission on a protected target branch.

https://claude.ai/code/session_01Wsno14cxE49MstXFs9G5KT

## Summary `cli/branch_rename.php` (exposed as the `moko repo:rename-branch` CLI command, `bin/moko:182`) renamed a branch by **deleting** the target and **recreating** it. When the target is a **protected branch** (e.g. `rc`), the delete fails — silently — and the recreate then returns **HTTP 409 "branch already exists"**, so the rename never happens. ## Fix Force-update the target ref in place instead: read the source branch HEAD, and if the target already exists `PATCH git/refs/heads/{to}` with `{sha, force:true}`; otherwise create it via `POST /branches`. `php -l` clean, phpcs PSR-12 clean. ## Context The `auto-release.yml` "Promote to RC" job that used to call this script has since been changed to do the rename **inline** in the workflow (Template-Generic PR #52), so promote-rc no longer depends on this script. This fix remains valuable for the **standalone `moko repo:rename-branch` command**, which would otherwise hit the same failure when renaming into a protected branch. Both paths require the caller's token to have force-push permission on a protected target branch. https://claude.ai/code/session_01Wsno14cxE49MstXFs9G5KT

jmiller added 1 commit 2026-07-04 23:26:11 +00:00

fix: promote-rc force-updates target ref instead of delete+recreate ... c7a26c1ce1

branch_rename.php deleted the target branch then recreated it. When the target (rc) is a protected branch, the delete silently fails and the recreate returns HTTP 409 'branch already exists', breaking every PR-to-main promote-rc. Force-update the ref in place via PATCH git/refs/heads/{to} (sha+force) when the target exists; still create it when it doesn't. Requires the CI token to have force-push permission on the protected rc branch.

jmiller force-pushed fix/promote-rc-force-update from e79908f275 to c7a26c1ce1 2026-07-04 23:26:11 +00:00 Compare

jmiller merged commit 120dbe3be2 into main 2026-07-04 23:26:40 +00:00

jmiller deleted branch fix/promote-rc-force-update 2026-07-04 23:26:44 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

automation

Automated processes or scripts

breaking-change

Breaking API or functionality change

build

Build system changes

ci-cd

CI/CD pipeline changes

config

Configuration file changes

css

CSS/styling changes

dependencies

Dependency updates

deploy-failure

Automated deploy failure tracking

docker

Docker configuration changes

documentation

Documentation changes

dolibarr

Dolibarr module or extension

generic

Generic project or library

good first issue

Good for newcomers

health-check

Repository health check results

health: excellent

Health score 90-100

health: fair

Health score 50-69

health: good

Health score 70-89

health: poor

Health score below 50

help wanted

Extra attention needed

html

HTML template changes

javascript

JavaScript code changes

joomla

Joomla extension or component

mokostandards

MokoStandards compliance

needs-review

Awaiting code review

php

PHP code changes

push-failure

File push failure requiring attention

python

Python code changes

security

Security-related changes

size/l

Large change (101-300 lines)

size/m

Medium change (31-100 lines)

size/s

Small change (11-30 lines)

size/xl

Extra large change (301-1000 lines)

size/xs

Extra small change (1-10 lines)

size/xxl

Extremely large change (1000+ lines)

standards-drift

Repository drifted from MokoStandards

standards-update

MokoStandards sync update

sync-failure

Bulk sync failure requiring attention

sync-report

Bulk sync run report

template-validation-failure

Template workflow validation failure

tests

Test suite changes

type: bug

Something isn't working

type: chore

Maintenance tasks

type: enhancement

Enhancement to existing feature

type: feature

New feature or request

type: refactor

Code refactoring

type: version

Version-related change

typescript

TypeScript code changes

version

Version bump or release

version-drift

Version mismatch detected

work-in-progress

Work in progress, not ready for merge

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoCLI#335