Browse Source

Merge branch 'stable-3.5'

* origin/stable-3.5:
  When marking commits as uninteresting don't care if the tree exists

Change-Id: I66559a72ed7284cb721cf929512af884c0db2d61
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-3.6
Matthias Sohn 10 years ago
parent
commit
2983d224eb
  1. 6
      org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java

6
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java

@ -246,7 +246,11 @@ public class ObjectWalk extends RevWalk {
public void markUninteresting(RevCommit c) throws MissingObjectException,
IncorrectObjectTypeException, IOException {
super.markUninteresting(c);
markTreeUninteresting(c.getTree());
try {
markTreeUninteresting(c.getTree());
} catch (MissingObjectException e) {
// we don't care if the tree of the commit does not exist locally
}
}
@Override

Loading…
Cancel
Save