summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
diff options
context:
space:
mode:
authorJonathan Nieder <jrn@google.com>2020-03-02 13:37:59 -0500
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2020-03-02 13:37:59 -0500
commitfb45137a7ca2d4f56ffd1a799c44a9e0d1c7e40c (patch)
tree0c99a303abf7b1d5339533a0f17319713e6a70fd /org.eclipse.jgit.test
parent8f961240f11340009ab86914e67cd2104c46f28d (diff)
parent7ba261fb5f516dce83adc6f3bd4ac1666a51193e (diff)
downloadjgit-fb45137a7ca2d4f56ffd1a799c44a9e0d1c7e40c.tar.gz
jgit-fb45137a7ca2d4f56ffd1a799c44a9e0d1c7e40c.zip
Merge "ObjectWalk: Add null check before skip tree."
Diffstat (limited to 'org.eclipse.jgit.test')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
index a3bfb71e40..da7b266125 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
@@ -216,4 +216,12 @@ public class ObjectWalkTest extends RevWalkTestCase {
assertSame(rw.lookupBlob(bId), objw.nextObject());
assertNull(objw.nextObject());
}
+
+ @Test
+ public void testSkipTreeWhenStartFromBlob() throws Exception {
+ final RevBlob f1 = blob("1");
+ objw.markStart(f1);
+ assertSame(f1, objw.nextObject());
+ objw.skipTree();
+ }
}