Fix showing branch if specified branch, tag or id does not exist.

gitbucket · Jul 11, 2013 · 62fb968 · 62fb968
1 parent 88b8567
commit 62fb968
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala
@@ -213,32 +213,28 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     if(repository.commitCount == 0){
       repo.html.guide(repository)
     } else {
-      val revision = if(revstr.isEmpty) repository.repository.defaultBranch else revstr
-
       JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-        // get latest commit
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+        // get specified commit
+        val (revCommit, revision) = try {
+          val revision = if(revstr.isEmpty) repository.repository.defaultBranch else revstr
+          (JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)), revision)
+        } catch {
+          case e: NullPointerException => {
+            val revision = repository.branchList.head
+            (JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)), revision)
+          }
+        }
         // get files
         val files = JGitUtil.getFileList(git, revision, path)
         // process README.md
         val readme = files.find(_.name == "README.md").map { file =>
           new String(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get, "UTF-8")
         }
 
-        repo.html.files(
-          // current branch
-          revision,
-          // repository
-          repository,
-          // current path
-          if(path == ".") Nil else path.split("/").toList,
-          // latest commit
-          new JGitUtil.CommitInfo(revCommit),
-          // file list
-          files,
-          // readme
-          readme
-        )
+        repo.html.files(revision, repository,
+          if(path == ".") Nil else path.split("/").toList, // current path
+          new JGitUtil.CommitInfo(revCommit), // latest commit
+          files, readme)
       }
     }
   }