Skip to content

Removes unreachable stashes from a branch when no reachable have found #4386

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

Merged
merged 1 commit into from
Jun 11, 2025
Merged

Removes unreachable stashes from a branch when no reachable have found #4386

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
50 changes: 24 additions & 26 deletions src/env/node/git/sub-providers/stash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,40 +111,38 @@ export class StashGitSubProvider implements GitStashSubProvider {
);

const ancestors = result.stdout.trim().split('\n');
if (ancestors?.length && (ancestors.length !== 1 || ancestors[0])) {
const reachableCommits = new Set(ancestors);

if (reachableCommits.size) {
const reachableStashes = new Set<string>();
const reachableCommits =
ancestors?.length && (ancestors.length !== 1 || ancestors[0]) ? new Set(ancestors) : undefined;
if (reachableCommits?.size) {
const reachableStashes = new Set<string>();

// First pass: mark directly reachable stashes
for (const [sha, s] of stash.stashes) {
if (s.parents.some(p => p === options.reachableFrom || reachableCommits.has(p))) {
reachableStashes.add(sha);
}
}

// First pass: mark directly reachable stashes
// Second pass: mark stashes that build upon reachable stashes
let changed;
do {
changed = false;
for (const [sha, s] of stash.stashes) {
if (s.parents.some(p => p === options.reachableFrom || reachableCommits.has(p))) {
if (!reachableStashes.has(sha) && s.parents.some(p => reachableStashes.has(p))) {
reachableStashes.add(sha);
changed = true;
}
}
} while (changed);

// Second pass: mark stashes that build upon reachable stashes
let changed;
do {
changed = false;
for (const [sha, s] of stash.stashes) {
if (!reachableStashes.has(sha) && s.parents.some(p => reachableStashes.has(p))) {
reachableStashes.add(sha);
changed = true;
}
}
} while (changed);

// Remove unreachable stashes
for (const [sha] of stash.stashes) {
if (!reachableStashes.has(sha)) {
stash.stashes.delete(sha);
}
// Remove unreachable stashes
for (const [sha] of stash.stashes) {
if (!reachableStashes.has(sha)) {
stash.stashes.delete(sha);
}
} else {
stash.stashes.clear();
}
} else {
stash.stashes.clear();
}
}

Expand Down