fix(branch): persist explicit finish bases - #750
Merged
NagyVikt merged 1 commit intoAug 31, 2026
Merged
Conversation
Repair restored lane metadata before finish gates and when reusing a branch with --base. Constraint: never persist the repo-wide fallback as branch-specific metadata. Tested: node --test test/git-base-branch.test.js; targeted branch reuse test; npm run lint
NagyVikt
marked this pull request as ready for review
August 31, 2026 14:00
NagyVikt
commented
Aug 31, 2026
NagyVikt
left a comment
NagyVikt
left a comment
Collaborator
Author
There was a problem hiding this comment.
🛡️ GitGuardex code-assist
1 finding(s) — 🟡 1 medium
✅ Merge gate: pass — no blocking findings (blocks on high/critical).
| Severity | Location | Finding |
|---|---|---|
| 🟡 medium | src/git/index.js:1102-1104 |
The explicit base is persisted before it is validated. A typo or nonexistent branch can overwrite previously valid branch metadata, causing |
Provider codex · commit 5647b49
NagyVikt
deleted the
agent/codex/repair-restored-branch-guardex-base-meta-2026-08-31-15-53
branch
August 31, 2026 14:05
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Test plan