Merge "ObjectWalk: Add null check before skip tree."

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();
+	}
 }

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

@@ -364,8 +364,10 @@ public class ObjectWalk extends RevWalk {
 	 * @since 5.4
 	 */
 	public void skipTree() {
+		if (currVisit != null) {
 			currVisit.ptr = currVisit.buf.length;
 		}
+	}
 
 	/**
 	 * Pop the next most recent object.