diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2014-10-12 23:42:55 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2014-10-12 23:45:45 +0200 |
| commit | 2983d224ebd70da0d417bf9d3172545540d685d7 (patch) | |
| tree | bfc991c9fb8c448a94f673e2a63dd6b93712a891 | |
| parent | a57670b11f89cf87112f1ac24338144a697b45fb (diff) | |
| parent | 88b25a58f0164ab609061cb20cfb83c3bcb9a9ec (diff) | |
| download | jgit-2983d224ebd70da0d417bf9d3172545540d685d7.tar.gz jgit-2983d224ebd70da0d417bf9d3172545540d685d7.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java index ef96b77c5f..b73ccb1974 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java +++ b/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 |