diff options
| author | Edwin Kempin <edwin.kempin@gmail.com> | 2013-02-06 07:37:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-06 07:37:57 +0000 |
| commit | becf649ee68f365858f1873c6919e0e1782ebd32 (patch) | |
| tree | 94b89ea7ca86b9330c28910a3964a8048c5d856c | |
| parent | 75013b8b0a5d5d4f0873f1a49712adaba3c19b89 (diff) | |
| parent | 146cd05beae036c2dd4371050000167d4de2e604 (diff) | |
Merge "Discard cache-automerge/* refs early in VisibleRefFilter." into stable-2.5
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java index bc9d9f7216..8d27c0e4cb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java @@ -74,7 +74,9 @@ public class VisibleRefFilter extends AbstractAdvertiseRefsHook { final List<Ref> deferredTags = new ArrayList<Ref>(); for (Ref ref : refs.values()) { - if (PatchSet.isRef(ref.getName())) { + if (ref.getName().startsWith(GitRepositoryManager.REFS_CACHE_AUTOMERGE)) { + continue; + } else if (PatchSet.isRef(ref.getName())) { // Reference to a patch set is visible if the change is visible. // if (visibleChanges.contains(Change.Id.fromRef(ref.getName()))) { |