Skip to content

Commit 3c4a882

Browse files
committed
Provide an actionable message instead of NPE if merge base cannot be found
Resolves #451
1 parent e834964 commit 3c4a882

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/main/java/com/vackosar/gitflowincrementalbuild/control/DifferentFiles.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,11 @@ private RevCommit getMergeBase(RevCommit baseCommit, RevCommit referenceHeadComm
162162
walk.markStart(walk.lookupCommit(baseCommit));
163163
walk.markStart(walk.lookupCommit(referenceHeadCommit));
164164
RevCommit commit = walk.next();
165-
walk.close();
165+
if (commit == null) {
166+
throw new IllegalStateException(String.format(
167+
"Cannot find merge base, try fetching more history.%n\tbase: %s%n\treference: %s",
168+
baseCommit, referenceHeadCommit));
169+
}
166170
logger.info("Using merge base of id: " + commit.getId());
167171
return commit;
168172
}

0 commit comments

Comments
 (0)