From 48a054cc8cd2409b3183ece4389014b06a00f6de Mon Sep 17 00:00:00 2001 From: Shane Mc Cormack Date: Sun, 1 May 2016 20:41:19 +0100 Subject: [PATCH] Fix NPE if there are no parents for a commit. --- src/org/mdonoughe/JGitDescribeTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/mdonoughe/JGitDescribeTask.java b/src/org/mdonoughe/JGitDescribeTask.java index aae36d7..39c275a 100644 --- a/src/org/mdonoughe/JGitDescribeTask.java +++ b/src/org/mdonoughe/JGitDescribeTask.java @@ -342,7 +342,9 @@ private static int distanceBetween (RevCommit child, RevCommit parent) { Queue pq = new LinkedList(); pq.add(commit); while (pq.size() > 0) { - for (RevCommit pp : pq.remove().getParents()) { + RevCommit rc = pq.remove(); + if (rc == null || rc.getParents() == null) { continue; } + for (RevCommit pp : rc.getParents()) { if (!seenb.contains(pp)) { seenb.add(pp); pq.add(pp);