Issue #2148: Added tests and increased # of commits to 5

GitTools · Mar 6, 2020 · d20e418 · d20e418
1 parent 4f431b8
commit d20e418
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs
@@ -232,6 +232,34 @@ public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
  fixture.AssertFullSemver("2.0.0+5");
  }
 
+ [Test]
+ public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithItEvenWithMoreThanTwoActiveBranches()
+ {
+ using var fixture = new EmptyRepositoryFixture();
+ fixture.Repository.MakeATaggedCommit("1.0.3");
+ fixture.Repository.MakeCommits(1);
+
+ fixture.Repository.CreateBranch("release-3.0.0");
+ fixture.Checkout("release-3.0.0");
+ fixture.Repository.MakeCommits(4);
+ fixture.Checkout("master");
+ fixture.Repository.MergeNoFF("release-3.0.0", Generate.SignatureNow());
+
+ fixture.Repository.CreateBranch("release-2.0.0");
+ fixture.Checkout("release-2.0.0");
+ fixture.Repository.MakeCommits(4);
+ fixture.Checkout("master");
+ fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+ fixture.Repository.CreateBranch("release-1.0.0");
+ fixture.Checkout("release-1.0.0");
+ fixture.Repository.MakeCommits(4);
+ fixture.Checkout("master");
+ fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
+
+ fixture.AssertFullSemver("3.0.0+10");
+ }
+
  [Test]
  public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
  {

diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
@@ -43,7 +43,7 @@ public virtual IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
  }
  return Enumerable.Empty<BaseVersion>();
  })
- .Take(2)
+ .Take(5)
  .ToList();
  return baseVersions;
  }

diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -42,7 +42,7 @@ public IEnumerable<BaseVersion> GetTaggedVersions(GitVersionContext context, Bra
  return null;
  })
  .Where(a => a != null)
- .Take(2)
+ .Take(5)
  .ToList();
 
  return tagsOnBranch.Select(t => CreateBaseVersion(context, t));