Various fixes for GH-2967 #3018
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR should fix #2967.
Description
There are quite a bit of assumptions in the Mainline codepath that doesn't seem to hold true, such as all branches having a merge base. I believe it should be a viable fallback to look for the current branch's origin commit when a merge base cannot be found. That and a few other fixes (mostly
null
protection) is added to fix #2967.Related Issue
Fixes #2967.
Motivation and Context
We don't want GitVersion to throw
NullReferenceException
. Ever.How Has This Been Tested?
I have not been able to conjure a test that provokes this problem yet, but I'll try once I find time. I'm keeping this in draft until such a test is implemented.
Checklist: