Merge branch 'master' into nugetprereleasetag

Author: qetza

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -171,7 +171,7 @@ public void InheritVersionFromReleaseBranch()
             fixture.MakeACommit();
             fixture.MakeACommit();
             fixture.Checkout("develop");
-            fixture.AssertFullSemver("2.1.0-alpha.0");
+            fixture.AssertFullSemver("1.1.0-alpha.1");
             fixture.MakeACommit();
             fixture.AssertFullSemver("2.1.0-alpha.1");
             fixture.MergeNoFF("release/2.0.0");

src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs

@@ -68,7 +68,11 @@ IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, Branch rel
         {
             var tagPrefixRegex = context.Configuration.GitTagPrefix;
             var repository = context.Repository;
+
             var baseSource = releaseBranch.FindMergeBase(context.CurrentBranch, repository);
+            if (baseSource == context.CurrentCommit)
+                return new BaseVersion[0];
+
             return releaseVersionStrategy
                 .GetVersions(tagPrefixRegex, releaseBranch, repository)
                 .Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));