Browse Source

Merge "Ignore non-commit refs when in RevWalkUtils.findBranchesReachableFrom"

stable-2.2
Robin Rosenberg 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
28adbb3500
  1. 5
      org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java

5
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java

@ -165,7 +165,10 @@ public final class RevWalkUtils {
final int SKEW = 24*3600; // one day clock skew
for (Ref ref : refs) {
RevCommit headCommit = revWalk.parseCommit(ref.getObjectId());
RevObject maybehead = revWalk.parseAny(ref.getObjectId());
if (!(maybehead instanceof RevCommit))
continue;
RevCommit headCommit = (RevCommit) maybehead;
// if commit is in the ref branch, then the tip of ref should be
// newer than the commit we are looking for. Allow for a large

Loading…
Cancel
Save