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

Merged
dev-qwen merged 1 commit from fix/issue-168 into main 2026-04-03 07:05:24 +00:00
Collaborator

Fixes #168

Changes

Fixes #168 ## Changes
dev-qwen added 1 commit 2026-04-03 06:58:50 +00:00
fix: fix: disinto release creates branch from dirty working tree (#168)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/pr/ci Pipeline was successful
ci/woodpecker/pr/smoke-init Pipeline was successful
6b104ae8e9
Collaborator

AI Review

Summary

This PR fixes two related problems in the disinto release command:

  1. The branch was created from the current HEAD (potentially dirty working tree)
  2. git add -A would stage all working tree changes, not just the vault item

Review

The fix is minimal and correct:

  • git checkout main && git pull origin main ensures the ops repo is on a clean, up-to-date main before branching
  • git checkout -B "$branch_name" main explicitly bases the new branch on main, not on whatever HEAD happened to be
  • git add "vault/actions/${id}.toml" stages only the specific vault file written at line 2914, replacing the unsafe git add -A

The vault TOML path vault/actions/${id}.toml is consistent with line 2914 where the file is written, and aligns with the path correction from PR #174 (fix for #167).

No issues found. The change is targeted, addresses the root cause, and does not introduce regressions.

Verdict

APPROVE — Fix correctly addresses dirty working tree by anchoring branch creation to main and staging only the vault TOML file


Reviewed at 6b104ae | AGENTS.md

## AI Review <!-- reviewed: 6b104ae8e9567e755396083a42d7b28688de6784 --> ### Summary This PR fixes two related problems in the `disinto release` command: 1. The branch was created from the current HEAD (potentially dirty working tree) 2. `git add -A` would stage all working tree changes, not just the vault item ### Review The fix is minimal and correct: - `git checkout main && git pull origin main` ensures the ops repo is on a clean, up-to-date main before branching - `git checkout -B "$branch_name" main` explicitly bases the new branch on main, not on whatever HEAD happened to be - `git add "vault/actions/${id}.toml"` stages only the specific vault file written at line 2914, replacing the unsafe `git add -A` The vault TOML path `vault/actions/${id}.toml` is consistent with line 2914 where the file is written, and aligns with the path correction from PR #174 (fix for #167). **No issues found.** The change is targeted, addresses the root cause, and does not introduce regressions. ### Verdict **APPROVE** — Fix correctly addresses dirty working tree by anchoring branch creation to main and staging only the vault TOML file --- *Reviewed at `6b104ae` | [AGENTS.md](AGENTS.md)*
review-bot approved these changes 2026-04-03 07:05:10 +00:00
review-bot left a comment
Collaborator

AI Review: APPROVE — Fix correctly addresses dirty working tree by anchoring branch creation to main and staging only the vault TOML file

AI Review: **APPROVE** — Fix correctly addresses dirty working tree by anchoring branch creation to main and staging only the vault TOML file
dev-qwen merged commit f5de84ae02 into main 2026-04-03 07:05:24 +00:00
dev-qwen deleted branch fix/issue-168 2026-04-03 07:05:25 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: johba/disinto#175
No description provided.