Update JGit to 2.3.1.201302201838-r.208-g75e1bdb Change-Id: I58e21197a806cf8da2b52fc1d51dbdc146e22721
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java index d64a19f..9e16697 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/LogServlet.java
@@ -25,6 +25,7 @@ import com.google.common.collect.Lists; import com.google.gitiles.CommitSoyData.KeySet; +import org.eclipse.jgit.diff.DiffConfig; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.RevWalkException; @@ -181,7 +182,9 @@ walk.markUninteresting(walk.parseCommit(view.getOldRevision().getId())); } if (!Strings.isNullOrEmpty(view.getPathPart())) { - walk.setTreeFilter(FollowFilter.create(view.getPathPart())); + walk.setTreeFilter(FollowFilter.create( + view.getPathPart(), + repo.getConfig().get(DiffConfig.KEY))); } return walk; }
diff --git a/pom.xml b/pom.xml index 1114cd7..4d35625 100644 --- a/pom.xml +++ b/pom.xml
@@ -32,7 +32,7 @@ <properties> <!-- Should track Gerrit's versions fairly closely. --> - <jgitVersion>2.3.1.201302201838-r.78-g8fcde4b</jgitVersion> + <jgitVersion>2.3.1.201302201838-r.208-g75e1bdb</jgitVersion> <jettyVersion>8.1.7.v20120910</jettyVersion> <slf4jVersion>1.6.1</slf4jVersion> </properties>