Merge branch 'stable'

* stable:
  Update 2.1.8 release notes
  Allow serving static files in subdirectories
  Normalize OpenID URLs with http:// prefix
  Ignore PartialResultException from LDAP.
  Fix MySQL counter resets
  Substantially speed up pushing changes for review
  Avoid costly findMergedInto during push to refs/for/*
  Add cache for tag advertisements

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
	gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
	pom.xml

Change-Id: Ife316e255a8045bd28ca399d55e70eb8a075c48f
This commit is contained in:
Shawn O. Pearce
2011-06-24 09:47:01 -07:00
14 changed files with 855 additions and 133 deletions

View File

@@ -15,6 +15,7 @@
package com.google.gerrit.sshd.commands;
import com.google.gerrit.reviewdb.ReviewDb;
import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.TransferConfig;
import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.sshd.AbstractGitCommand;
@@ -33,6 +34,9 @@ final class Upload extends AbstractGitCommand {
@Inject
private TransferConfig config;
@Inject
private TagCache tagCache;
@Override
protected void runImpl() throws IOException, Failure {
if (!projectControl.canRunUploadPack()) {
@@ -41,7 +45,8 @@ final class Upload extends AbstractGitCommand {
final UploadPack up = new UploadPack(repo);
if (!projectControl.allRefsAreVisible()) {
up.setRefFilter(new VisibleRefFilter(repo, projectControl, db.get(), true));
up.setRefFilter(new VisibleRefFilter(tagCache, repo, projectControl,
db.get(), true));
}
up.setPackConfig(config.getPackConfig());
up.setTimeout(config.getTimeout());