Skip to content

Fix: reparent children when deleting a branch #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vpalcar wants to merge 1 commit into
base: fix/getBranchCommits-parsing
Choose a base branch
from
Open

Fix: reparent children when deleting a branch #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion packages/core/src/stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,21 @@ export class StackManager {
}

async deleteBranch(branchName: string, force = false): Promise<void> {
// Remove from tracking first
// Reparent children to the deleted branch's parent
const relationship = this.state.getBranchRelationship(branchName);
const parent = relationship?.parent ?? this.getTrunk();
const children = this.state.getChildren(branchName);
for (const child of children) {
const childRel = this.state.getBranchRelationship(child);
if (childRel) {
this.state.setBranchRelationship(child, {
...childRel,
parent,
});
}
}

// Remove from tracking
this.state.removeBranchRelationship(branchName);

// Then delete the git branch
Expand Down