diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java index 3c2beca6..1c6eca82 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java @@ -19,7 +19,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.lang.invoke.MethodHandles; -import java.net.URI; import java.util.List; import org.eclipse.jgit.api.CheckoutCommand; @@ -147,12 +146,16 @@ class GitRepo { try(Git git = this.gitFactory.open(file(this.basedir))) { List refs = git.branchList().setListMode(ListBranchCommand.ListMode.ALL) .call(); - return refs.stream().anyMatch(ref -> ref.getName().contains(branch)); + return refs.stream().anyMatch(ref -> branch.equals(nameOfBranch(ref.getName()))); } catch (Exception e) { throw new IllegalStateException(e); } } + private String nameOfBranch(String branch) { + return branch.substring(branch.lastIndexOf("/") + 1); + } + private void printLog(Git git) throws GitAPIException, IOException { int maxCount = 5; String currentBranch = git.getRepository().getBranch();