From be83f87b148a8091af7ade77994738713b96ca85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 12 Mar 2019 15:10:59 +0100 Subject: [PATCH] Remove dead code --- .../sonia/scm/repository/spi/GitLogCommand.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java index cae62ad362..a42abca5f0 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java @@ -43,7 +43,6 @@ import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.revwalk.filter.RevFilter; import org.eclipse.jgit.treewalk.filter.AndTreeFilter; import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.treewalk.filter.TreeFilter; @@ -290,17 +289,4 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand return changesets; } - - private ObjectId computeCommonAncestor(LogCommandRequest request, Repository repository, ObjectId startId, Ref branch) throws IOException { - try (RevWalk mergeBaseWalk = new RevWalk(repository)) { - mergeBaseWalk.setRevFilter(RevFilter.MERGE_BASE); - if (startId != null) { - mergeBaseWalk.markStart(mergeBaseWalk.lookupCommit(startId)); - } else { - mergeBaseWalk.markStart(mergeBaseWalk.lookupCommit(branch.getObjectId())); - } - mergeBaseWalk.markStart(mergeBaseWalk.parseCommit(repository.resolve(request.getAncestorChangeset()))); - return mergeBaseWalk.next().getId(); - } - } }