#2268 Correct a version calculation for non-master mainline branches

Kirill-Maurin · Kirill-Maurin · commit 4051a6f7e466 · 2020-05-11T20:47:44.000+03:00
diff --git a/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs
@@ -69,7 +69,7 @@ public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
                 mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);
 
                 // branches other than master always get a bump for the act of branching
-                if (context.CurrentBranch.FriendlyName != "master")
+                if (!context.CurrentBranch.IsSameBranch(mainline))
                 {
                     var branchIncrement = FindMessageIncrement(null, context.CurrentCommit, mergeBase, mainlineCommitLog);
                     log.Info($"Performing {branchIncrement} increment for current branch ");

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)`
`69`	`69`	`mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);`
`70`	`70`
`71`	`71`	`// branches other than master always get a bump for the act of branching`
`72`		`- if (context.CurrentBranch.FriendlyName != "master")`
	`72`	`+ if (!context.CurrentBranch.IsSameBranch(mainline))`
`73`	`73`	`{`
`74`	`74`	`var branchIncrement = FindMessageIncrement(null, context.CurrentCommit, mergeBase, mainlineCommitLog);`
`75`	`75`	`log.Info($"Performing {branchIncrement} increment for current branch ");`