commit | 247170c18fecdffc7603f466d0cf60e911063411 | [log] [tgz] |
---|---|---|
author | Björn Pedersen <iceelch@googlemail.com> | Mon Jan 11 09:51:24 2016 +0100 |
committer | Björn Pedersen <iceelch@googlemail.com> | Mon Jan 11 16:21:34 2016 +0000 |
tree | 84cb3e76bf5b8951e54a4d7aeca36fff0b367b2c | |
parent | 490a6490d6560beca9ebb83dfaa186b79b3daa09 [diff] |
Update to upstream jgit version Followup changes necessary after https://gerrit-review.googlesource.com/#/c/73632/ Change-Id: I5f35c15c0904a93a2a59390ff6d5b049e9f3177a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java index b07bf91..0550e6e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java +++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/FilteredRepository.java
@@ -29,6 +29,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; +import org.eclipse.jgit.attributes.AttributesNodeProvider; import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.lib.ObjectDatabase; import org.eclipse.jgit.lib.Ref; @@ -108,6 +109,11 @@ } @Override + public AttributesNodeProvider createAttributesNodeProvider() { + return delegate.createAttributesNodeProvider(); + } + + @Override public ObjectDatabase getObjectDatabase() { // No access control on object database; Gitiles ensures objects are only // accessed if they are visible by the user according to ACLs on the refs.