Fix the CommitsSinceVersionSource count in case a Release branch was merged and deleted

Author: Ruh Ullah Shah

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -223,6 +223,7 @@ public void TagOnHotfixShouldNotAffectDevelop()
         }
     }
 
+    [Test]
     public void CommitsSinceVersionSourceShouldNotGoDownUponGitFlowReleaseFinish()
     {
         var config = new Config

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -51,7 +51,7 @@ public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
             fixture.Repository.MakeACommit();
             fixture.Repository.Branches.Remove("release/1.0.0");
 
-            fixture.AssertFullSemver("1.1.0-alpha.2");
+            fixture.AssertFullSemver("1.1.0-alpha.3");
         }
     }
 

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -1,7 +1,9 @@
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation
 {
     using System;
+    using System.Collections.Generic;
     using System.Linq;
+    using System.Text.RegularExpressions;
     using GitVersion.VersionCalculation.BaseVersionCalculators;
 
     public class BaseVersionCalculator : IBaseVersionCalculator
@@ -37,13 +39,15 @@ public BaseVersion GetBaseVersion(GitVersionContext context)
 
                         return true;
                     })
-                    .Select(v => new
+                    .Select(v => new Versions
                     {
                         IncrementedVersion = MaybeIncrement(context, v),
                         Version = v
                     })
                     .ToList();
 
+                FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted
+                    (context, baseVersions);
                 var maxVersion = baseVersions.Aggregate((v1, v2) => v1.IncrementedVersion > v2.IncrementedVersion ? v1 : v2);
                 var matchingVersionsOnceIncremented = baseVersions
                     .Where(b => b.Version.BaseVersionSource != null && b.IncrementedVersion == maxVersion.IncrementedVersion)
@@ -92,5 +96,45 @@ public static SemanticVersion MaybeIncrement(GitVersionContext context, BaseVers
 
             return version.SemanticVersion;
         }
+
+        private void FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted(
+            GitVersionContext context, List<Versions> baseVersions)
+        {
+            if (!ReleaseBranchExistsInRepo(context))
+            {
+                foreach (var baseVersion in baseVersions)
+                {
+                    if (baseVersion.Version.Source.Contains("Merge message")
+                        && baseVersion.Version.Source.Contains("Merge branch")
+                        && baseVersion.Version.Source.Contains("release"))
+                    {
+                        var parents = baseVersion.Version.BaseVersionSource.Parents.ToList();
+                        baseVersion.Version = new BaseVersion(
+                            context,
+                            baseVersion.Version.Source,
+                            baseVersion.Version.ShouldIncrement,
+                            baseVersion.Version.SemanticVersion,
+                            context.Repository.ObjectDatabase.FindMergeBase(parents[0], parents[1]),
+                            baseVersion.Version.BranchNameOverride);
+                    }
+                }
+            }
+        }
+
+        private bool ReleaseBranchExistsInRepo(GitVersionContext context)
+        {
+            var releaseBranchConfig = context.FullConfiguration.Branches
+                .Where(b => b.Value.IsReleaseBranch == true)
+                .ToList();
+            var releaseBranches = context.Repository.Branches
+                    .Where(b => releaseBranchConfig.Any(c => Regex.IsMatch(b.FriendlyName, c.Value.Regex)));
+            return releaseBranches.Any();
+        }
+
+        private class Versions
+        {
+            public SemanticVersion IncrementedVersion { get; set; }
+            public BaseVersion Version { get; set; }
+        }
     }
-}
+}