Skip to content

Commit 560581e

Browse files
author
Vladimir Kotal
committed
introduce getJGitRepository()
1 parent 5bbc33a commit 560581e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/history/GitRepository.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -595,10 +595,13 @@ boolean hasFileBasedTags() {
595595
return true;
596596
}
597597

598+
private org.eclipse.jgit.lib.Repository getJGitRepository(String directory) throws IOException {
599+
return FileRepositoryBuilder.create(Paths.get(directory, ".git").toFile());
600+
}
601+
598602
private void rebuildTagList(File directory) {
599603
this.tagList = new TreeSet<>();
600-
try (org.eclipse.jgit.lib.Repository repository = FileRepositoryBuilder.
601-
create(Paths.get(directory.getAbsolutePath(), ".git").toFile())) {
604+
try (org.eclipse.jgit.lib.Repository repository = getJGitRepository(directory.getAbsolutePath())) {
602605
try (Git git = new Git(repository)) {
603606
List<Ref> refList = git.tagList().call(); // refs sorted according to tag names
604607
Map<RevCommit, String> commit2Tags = new HashMap<>();
@@ -687,24 +690,21 @@ private RevCommit getCommit(org.eclipse.jgit.lib.Repository repository, Ref ref)
687690

688691
@Override
689692
String determineParent(CommandTimeoutType cmdType) throws IOException {
690-
try (org.eclipse.jgit.lib.Repository repository = FileRepositoryBuilder.
691-
create(Paths.get(getDirectoryName(), ".git").toFile())) {
693+
try (org.eclipse.jgit.lib.Repository repository = getJGitRepository(getDirectoryName())) {
692694
return repository.getConfig().getString("remote", "origin", "url");
693695
}
694696
}
695697

696698
@Override
697699
String determineBranch(CommandTimeoutType cmdType) throws IOException {
698-
try (org.eclipse.jgit.lib.Repository repository = FileRepositoryBuilder.
699-
create(Paths.get(getDirectoryName(), ".git").toFile())) {
700+
try (org.eclipse.jgit.lib.Repository repository = getJGitRepository(getDirectoryName())) {
700701
return repository.getBranch();
701702
}
702703
}
703704

704705
@Override
705706
public String determineCurrentVersion(CommandTimeoutType cmdType) throws IOException {
706-
try (org.eclipse.jgit.lib.Repository repository = FileRepositoryBuilder.
707-
create(Paths.get(getDirectoryName(), ".git").toFile())) {
707+
try (org.eclipse.jgit.lib.Repository repository = getJGitRepository(getDirectoryName())) {
708708
Ref head = repository.exactRef(Constants.HEAD);
709709
if (head != null && head.getObjectId() != null) {
710710
try (RevWalk walk = new RevWalk(repository); ObjectReader reader = repository.newObjectReader()) {

0 commit comments

Comments
 (0)