Merge pull request #294 from marko-bekhta/fix/i293-change-how-ref-id-…

…is-obtained Change how git ref id is obtained
quarkusio · Jun 26, 2024 · fdf8f40 · fdf8f40
2 parents 5ea2d2e + 8eeff0b
commit fdf8f40
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/io/quarkus/search/app/util/GitCloneDirectory.java b/src/main/java/io/quarkus/search/app/util/GitCloneDirectory.java
@@ -25,7 +25,6 @@
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevTree;
 import org.eclipse.jgit.submodule.SubmoduleStatus;
 import org.jboss.logging.Logger;
@@ -141,12 +140,12 @@ private static RevTree treeForBranch(GitCloneDirectory cloneDirectory, String br
             if (cloneDirectory.remoteName == null) {
                 ref = branch;
             } else {
-                Map<String, Ref> stringRefMap = cloneDirectory.git.lsRemote().setRemote(cloneDirectory.remoteName)
-                        .callAsMap();
-                ref = stringRefMap.get("refs/heads/" + branch).getObjectId().name();
+                ref = cloneDirectory.git.getRepository().getRefDatabase()
+                        .findRef("refs/remotes/%s/%s".formatted(cloneDirectory.remoteName, branch))
+                        .getObjectId().name();
             }
             return GitUtils.firstExistingRevTree(cloneDirectory.git.getRepository(), ref);
-        } catch (IOException | GitAPIException e) {
+        } catch (IOException e) {
             throw new RuntimeException("Unable to locate branch: " + cloneDirectory.details.branches.pages(), e);
         }
     }