From 1e9b60446f9ba9931c5bfca8dc9ae96fd08f1476 Mon Sep 17 00:00:00 2001
From: Uli Heller <uli.heller@daemons-point.com>
Date: Fri, 21 Sep 2018 17:38:05 +0200
Subject: [PATCH 1/3] Upgraded to jgit-5.1.1, issue #2134 does not exist with
 this version

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index e07854fb8..470c8b5d3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,7 +6,7 @@ val Name = "gitbucket"
 val GitBucketVersion = "4.28.0"
 val ScalatraVersion = "2.6.3"
 val JettyVersion = "9.4.11.v20180605"
-val JgitVersion = "5.0.1.201806211838-r"
+val JgitVersion = "5.1.1.201809181055-r"
 
 lazy val root = (project in file("."))
   .enablePlugins(SbtTwirl, ScalatraPlugin)

From 318cdafcb179df7097f4d2c30c6b1e699eb415cb Mon Sep 17 00:00:00 2001
From: Uli Heller <uli.heller@daemons-point.com>
Date: Fri, 21 Sep 2018 19:58:50 +0200
Subject: [PATCH 2/3] Fixed deprecation warning, part 1/2

---
 src/main/scala/gitbucket/core/controller/ApiController.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala
index 63248b498..685a8b4d7 100644
--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -256,9 +256,9 @@ trait ApiControllerBase extends ControllerBase {
       } else {
         val refs = git
           .getRepository()
-          .getAllRefs()
+          .getRefDatabase()
+          .getRefsByPrefix("refs/")
           .asScala
-          .collect { case (str, ref) if str.startsWith("refs/" + revstr) => ref }
 
         JsonFormat(refs.map { ref =>
           val sha = ref.getObjectId().name()

From fd0bc8028480822472108e236dfe45ee5b44bfc5 Mon Sep 17 00:00:00 2001
From: Uli Heller <uli.heller@daemons-point.com>
Date: Fri, 21 Sep 2018 20:03:58 +0200
Subject: [PATCH 3/3] Fixed deprecation warning, part 2/2

---
 .../scala/gitbucket/core/util/JGitUtil.scala  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
index bef631af6..07881c649 100644
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -740,15 +740,17 @@ object JGitUtil {
   def getBranchesOfCommit(git: Git, commitId: String): List[String] =
     using(new RevWalk(git.getRepository)) { revWalk =>
       defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))) { commit =>
-        git.getRepository.getAllRefs.entrySet.asScala
+        git.getRepository.getRefDatabase
+          .getRefsByPrefix(Constants.R_HEADS)
+          .asScala
           .filter { e =>
-            (e.getKey.startsWith(Constants.R_HEADS) && revWalk.isMergedInto(
+            (revWalk.isMergedInto(
               commit,
-              revWalk.parseCommit(e.getValue.getObjectId)
+              revWalk.parseCommit(e.getObjectId)
             ))
           }
           .map { e =>
-            e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
+            e.getName.substring(Constants.R_HEADS.length)
           }
           .toList
           .sorted
@@ -781,15 +783,17 @@ object JGitUtil {
   def getTagsOfCommit(git: Git, commitId: String): List[String] =
     using(new RevWalk(git.getRepository)) { revWalk =>
       defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))) { commit =>
-        git.getRepository.getAllRefs.entrySet.asScala
+        git.getRepository.getRefDatabase
+          .getRefsByPrefix(Constants.R_TAGS)
+          .asScala
           .filter { e =>
-            (e.getKey.startsWith(Constants.R_TAGS) && revWalk.isMergedInto(
+            (revWalk.isMergedInto(
               commit,
-              revWalk.parseCommit(e.getValue.getObjectId)
+              revWalk.parseCommit(e.getObjectId)
             ))
           }
           .map { e =>
-            e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
+            e.getName.substring(Constants.R_TAGS.length)
           }
           .toList
           .sorted