From 14a7983f49cb8aaaf0d6f6f08705fbd7094f8880 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 29 Mar 2021 12:04:52 +0400 Subject: [PATCH] #16 -- Checkout specific branch --- .../java/ru/ulstu/extractor/service/GitRepositoryService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java b/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java index 93c9aab..e99e700 100644 --- a/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java +++ b/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java @@ -32,6 +32,7 @@ import static org.apache.logging.log4j.util.Strings.isBlank; @Service public class GitRepositoryService { + private static final String BRANCH_PREFIX = "refs/remotes/origin/"; @Value("${extractor.custom-projects-dir}") private String customProjectsDir; @@ -207,7 +208,7 @@ public class GitRepositoryService { return git.branchList().setListMode(ListBranchCommand.ListMode.REMOTE) .call() .stream() - .map(r -> new Branch(r.getName())) + .map(r -> new Branch(r.getName().replace(BRANCH_PREFIX, ""))) .collect(Collectors.toList()); } }