Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-06 20:57:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #723 from team-lab/fix/#721-npe-getFileList-multi-origin-subfolder

Browse Source 
(refs #721)NullPointerException on getFileList
This commit is contained in:
Naoki Takezoe
2015-04-24 01:57:01 +09:00
parent 8590c693b9 ebc5219ce6
commit 32e6f584d8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/gitbucket/core/util/JGitUtil.scala
View File

@@ -287,9 +287,6 @@ object JGitUtil {
}
}
revWalk.markStart(revCommit)
if(path != "."){
revWalk.setTreeFilter(PathFilter.create(path))
}
val it = revWalk.iterator
val lastCommit = it.next
val nextParentsMap = Option(lastCommit).map(_.getParents.map(_ -> lastCommit).toMap).getOrElse(Map())

12
src/test/scala/gitbucket/core/util/JGitUtilSpec.scala
View File

@@ -90,4 +90,14 @@ class JGitUtilSpec extends Specification {
list("master", "dir/subdir") mustEqual List(("File3.md", "commit7", false), ("File4.md", "commit4", false))
}
}
}
"getFileList subfolder multi-origin (issue #721)" should {
withTestRepository { git =>
def list(branch: String, path: String) =
JGitUtil.getFileList(git, branch, path).map(finfo => (finfo.name, finfo.message, finfo.isDirectory))
createFile(git, "master", "README.md", "body1", message = "commit1")
createFile(git, "branch", "test/text2.txt", "body2", message = "commit2")
mergeAndCommit(git, "master", "branch", message = "merge3")
list("master", "test") mustEqual List(("text2.txt", "commit2", false))
}
}
}