Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

(fix #58) Fix bug that failed to view tag tree

Browse Source
This commit is contained in:
Tomofumi Tanaka
2013-08-04 01:28:47 +09:00
parent b54a9ace9f
commit d26faac0e6
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/util/JGitUtil.scala
View File

@@ -132,15 +132,18 @@ object JGitUtil {
} }
/** /**
* Returns RevCommit from the commit id. * Returns RevCommit from the commit or tag id.
* *
* @param git the Git object * @param git the Git object
* @param commitId the ObjectId of the commit * @param objectId the ObjectId of the commit or tag
* @return the RevCommit for the specified commit * @return the RevCommit for the specified commit or tag
*/ */
def getRevCommitFromId(git: Git, commitId: ObjectId): RevCommit = { def getRevCommitFromId(git: Git, objectId: ObjectId): RevCommit = {
val revWalk = new RevWalk(git.getRepository) val revWalk = new RevWalk(git.getRepository)
val revCommit = revWalk.parseCommit(commitId) val revCommit = revWalk.parseAny(objectId) match {
case r: RevTag => revWalk.parseCommit(r.getObject)
case _ => revWalk.parseCommit(objectId)
}
revWalk.dispose revWalk.dispose
revCommit revCommit
} }
@@ -348,7 +351,7 @@ object JGitUtil {
* @return the list of latest commit * @return the list of latest commit
*/ */
def getLatestCommitFromPaths(git: Git, paths: List[String], revision: String): Map[String, RevCommit] = { def getLatestCommitFromPaths(git: Git, paths: List[String], revision: String): Map[String, RevCommit] = {
val start = git.getRepository.resolve(revision) val start = getRevCommitFromId(git, git.getRepository.resolve(revision))
paths.map { path => paths.map { path =>
val commit = git.log.add(start).addPath(path).setMaxCount(1).call.iterator.next val commit = git.log.add(start).addPath(path).setMaxCount(1).call.iterator.next
(path, commit) (path, commit)