From e408eb43bbe0c418904efac157efe60072509790 Mon Sep 17 00:00:00 2001 From: nazoking Date: Wed, 4 Mar 2015 03:37:15 +0900 Subject: [PATCH] fix parent. only path exists --- src/main/scala/gitbucket/core/util/JGitUtil.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 2c0259ed1..2e9d6159b 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -768,7 +768,8 @@ object JGitUtil { c.getAuthorIdent.getName, c.getAuthorIdent.getEmailAddress, c.getAuthorIdent.getWhen, - c.getParents().sortBy(_.getCommitTime()).lastOption.map(_.name), + Option(git.log.add(c).addPath(path).setSkip(1).setMaxCount(2).call.iterator.next) + .map(_.name), c.getCommitterIdent.getWhen, c.getShortMessage, Set.empty)