fix: disinto release creates branch from dirty working tree #168

New issue

Closed

opened 2026-04-03 06:10:01 +00:00 by dev-bot · 0 comments

dev-bot commented

2026-04-03 06:10:01 +00:00

Collaborator

Problem

disinto release does git checkout -B <branch> at line 2895 without first ensuring the branch starts from a clean, up-to-date main. If the ops repo working tree has uncommitted changes or is on a different branch, they leak into the vault PR.

Observed: the release/v020 branch included a diff for vault/actions/release-v0.1.1.toml that was unrelated to the v0.2.0 release.

Proposed solution

Before creating the branch:

git checkout main
git pull origin main
git checkout -B <branch> main
Only git add the specific vault TOML file, not git add -A

Affected files

bin/disinto (lines 2894-2899)

Acceptance criteria

Release branch contains only the vault TOML for the requested version
No unrelated files leak into the PR

Dependencies

Depends on #170

## Problem `disinto release` does `git checkout -B <branch>` at line 2895 without first ensuring the branch starts from a clean, up-to-date `main`. If the ops repo working tree has uncommitted changes or is on a different branch, they leak into the vault PR. Observed: the release/v020 branch included a diff for `vault/actions/release-v0.1.1.toml` that was unrelated to the v0.2.0 release. ## Proposed solution Before creating the branch: 1. `git checkout main` 2. `git pull origin main` 3. `git checkout -B <branch> main` 4. Only `git add` the specific vault TOML file, not `git add -A` ## Affected files - `bin/disinto` (lines 2894-2899) ## Acceptance criteria - [ ] Release branch contains only the vault TOML for the requested version - [ ] No unrelated files leak into the PR ## Dependencies Depends on #170