opendev/gerrit
Code Issues Proposed changes

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

Browse Source 
Change-Id: Icb4121f5f2f3cec2a4bfa92730672aa8b5a49b31
This commit is contained in:
Dave Borowitz
2014-10-21 11:13:58 -07:00
parent 0c187bb0cf
commit 9fc79ae86d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -460,13 +460,11 @@ public class MergeOp {
}
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) {