Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2013-01-01 20:58:04 +0000
committerGerrit Code Review @ Eclipse.org2013-01-01 20:58:04 +0000
commitc8c258169f8c46ef8ea959cd6d5b705237876ba8 (patch)
tree1bbbd55bfee3245ede8b07ad34e4a051aa6c8b90
parent315f1cfa5c63f4d3355704c80d00ac1323a36171 (diff)
parent0b6387fe7c575b40578a8478392eb1cf35f8a136 (diff)
downloadjgit-c8c258169f8c46ef8ea959cd6d5b705237876ba8.tar.gz
jgit-c8c258169f8c46ef8ea959cd6d5b705237876ba8.tar.xz
jgit-c8c258169f8c46ef8ea959cd6d5b705237876ba8.zip
Merge "Revert "Stop PathFilter after walking all matching paths""
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java
index 365a820981..d85ea8cc5d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilter.java
@@ -44,7 +44,6 @@
package org.eclipse.jgit.treewalk.filter;
-import org.eclipse.jgit.errors.StopWalkException;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -98,10 +97,7 @@ public class PathFilter extends TreeFilter {
@Override
public boolean include(final TreeWalk walker) {
- int cmp = walker.isPathPrefix(pathRaw, pathRaw.length);
- if (cmp > 0)
- throw StopWalkException.INSTANCE;
- return cmp == 0;
+ return walker.isPathPrefix(pathRaw, pathRaw.length) == 0;
}
@Override

Back to the top