Skip to content

Fix getOrphanedBranches prunes stale tracking branches functional test #321

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

Closed
MichaelSims wants to merge 1 commit into from
Closed

Fix getOrphanedBranches prunes stale tracking branches functional test #321

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: 12 additions & 4 deletions git-jaspr/src/test/kotlin/sims/michael/gitjaspr/GitJasprTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3419,10 +3419,18 @@ interface GitJasprTest {
}
)

remoteGit.deleteBranches(
listOf(buildRemoteRef("c"), buildRemoteRef("c_01")),
force = true,
)
// This could be cleaner. We need the remote branches gone so we can verify that
// getOrphanedBranches does a fetch w/prune before returning results. The mechanism to
// remove the remote branches depends on whether we're using a fake remote.
val remoteBranchesToRemove = listOf(buildRemoteRef("c"), buildRemoteRef("c_01"))
if (useFakeRemote) {
remoteGit.deleteBranches(remoteBranchesToRemove, force = true)
} else {
localGit.push(
remoteBranchesToRemove.map { name -> RefSpec(FORCE_PUSH_PREFIX, name) },
remoteName,
)
}

assertEquals(
listOf(buildRemoteRef("b"), buildRemoteRef("b_01")),
Expand Down
Loading