SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed invalid branch existance verification

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-07-31 22:34:36 +02:00
parent 97859ff6e9
commit 007d395609
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java
View File

@@ -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<Ref> 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();