Skip to content
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

Jump to bottom

Restrict list of detected branches to remote only to avoid duplication #266

Merged
merged 1 commit into from
Jul 7, 2023
Merged

Restrict list of detected branches to remote only to avoid duplication #266

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
3 changes: 1 addition & 2 deletions src/main/kotlin/nl/avisi/structurizr/site/generatr/ClonedRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package nl.avisi.structurizr.site.generatr
import org.eclipse.jgit.api.CreateBranchCommand
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.api.ListBranchCommand
import org.eclipse.jgit.lib.Ref
import org.eclipse.jgit.storage.file.FileRepositoryBuilder
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
import java.io.File
Expand Down Expand Up @@ -52,7 +51,7 @@ class ClonedRepository(
}

fun getBranchNames(excludeBranches: List<String>) =
Git(repo).branchList().setListMode(ListBranchCommand.ListMode.ALL).call()
Git(repo).branchList().setListMode(ListBranchCommand.ListMode.REMOTE).call()
.map { it.name.toString().substringAfterLast("/") }
.onEach { println("Found the following branch: $it") }
.filter { it !in excludeBranches }
Expand Down