commit 9fc79ae86d35817d265d1bc4d57a24428bfc43b3
author Dave Borowitz <dborowitz@google.com> Tue Oct 21 11:13:58 2014 -0700
committer Dave Borowitz <dborowitz@google.com> Tue Oct 21 11:23:55 2014 -0700
tree 15ce2caed7dbfb23bd3ccfeb7259d8c5392f94a9
parent 0c187bb0cf7f9456205a8eaf826036290041f6c7

MergeOp: Don't get all refs when just refs/heads/* will do

Change-Id: Icb4121f5f2f3cec2a4bfa92730672aa8b5a49b31

gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index 8f3ad20..08db1f1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -460,13 +460,11 @@
     }
 
     try {
-      for (Ref r : repo.getRefDatabase().getRefs(ALL).values()) {
-        if (r.getName().startsWith(Constants.R_HEADS)) {
-          try {
-            alreadyAccepted.add(rw.parseCommit(r.getObjectId()));
-          } catch (IncorrectObjectTypeException iote) {
-            // Not a commit? Skip over it.
-          }
+      for (Ref r : repo.getRefDatabase().getRefs(Constants.R_HEADS).values()) {
+        try {
+          alreadyAccepted.add(rw.parseCommit(r.getObjectId()));
+        } catch (IncorrectObjectTypeException iote) {
+          // Not a commit? Skip over it.
         }
       }
     } catch (IOException e) {