commit 11e6dd8d48048b2a1326878c11a6bc25517fcfea
author Dave Borowitz <dborowitz@google.com> Tue Apr 17 10:37:03 2018 +0200
committer Dave Borowitz <dborowitz@google.com> Tue Apr 17 11:10:14 2018 +0200
tree b8bbb002bfa4bf72843abfd66668c011fac6259a
parent 0009f2b1df55018042678417cc039ecc3bc5f327

ProjectState: Read ProjectLevelConfig from consistent revision

We can't guarantee a consistent read of the file in all parent projects,
but we can at least guarantee that the file is read in the same revision
as the ProjectConfig in this specific project.

Change-Id: Id9bc92d9fadc5d845ad2fd6aadadcf985a1fc571

java/com/google/gerrit/server/project/ProjectState.java

diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java
index 11327cd..e064265 100644
--- a/java/com/google/gerrit/server/project/ProjectState.java
+++ b/java/com/google/gerrit/server/project/ProjectState.java
@@ -261,7 +261,7 @@
 
     ProjectLevelConfig cfg = new ProjectLevelConfig(fileName, this);
     try (Repository git = gitMgr.openRepository(getNameKey())) {
-      cfg.load(git);
+      cfg.load(git, config.getRevision());
     } catch (IOException | ConfigInvalidException e) {
       log.warn("Failed to load " + fileName + " for " + getName(), e);
     }