From 833fd094420f1b28623aa565c2d20de76e3409eb Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sat, 8 Sep 2012 12:07:24 +0200 Subject: [PATCH] Ignore non-commit refs when in RevWalkUtils.findBranchesReachableFrom This methods is for finding branches only. Change-Id: Ic68b5295ff814401890f0592ae95851554706ca6 --- .../src/org/eclipse/jgit/revwalk/RevWalkUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java index 83f5f924e5..f223dea445 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java +++ b/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 -- 2.39.5