summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
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
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')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java4
1 files changed, 3 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 21ce78e7e9..04a4b4c631 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
@@ -364,7 +364,9 @@ public class ObjectWalk extends RevWalk {
* @since 5.4
*/
public void skipTree() {
- currVisit.ptr = currVisit.buf.length;
+ if (currVisit != null) {
+ currVisit.ptr = currVisit.buf.length;
+ }
}
/**