Skip to content

Commit a99f256

Browse files
authored
Merge pull request #1237 from SimonCropp/nullCheckMergeBase
add a null check for the merge base
2 parents 30f413a + 7938af1 commit a99f256

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/GitVersionCore/GitRepoMetadataProvider.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,14 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
147147
var second = forwardMerge.Parents.First();
148148
Logger.WriteDebug("Second " + second.Sha);
149149
var mergeBase = Repository.ObjectDatabase.FindMergeBase(commit, second);
150-
Logger.WriteDebug("New Merge base " + mergeBase.Sha);
151-
150+
if (mergeBase == null)
151+
{
152+
Logger.WriteWarning("Could not find mergbase for " + commit);
153+
}
154+
else
155+
{
156+
Logger.WriteDebug("New Merge base " + mergeBase.Sha);
157+
}
152158
if (mergeBase == findMergeBase)
153159
{
154160
Logger.WriteDebug("Breaking");

0 commit comments

Comments
 (0)