Merge pull request #2413 from gerwinjansen/GitVersion-calculating-wrong-version-when-building-a-tag

Git version calculating wrong version when building a tag

Author: asbjornu

src/GitVersionCore.Tests/IntegrationTests/TagCheckoutScenarios.cs

@@ -28,5 +28,24 @@ public void GivenARepositoryWithSingleCommitAndSingleBranch()
 
             fixture.AssertFullSemver(taggedVersion);
         }
+
+        [Test]
+        public void GivenARepositoryWithTwoTagsAndADevelopBranch()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+            const string firstVersion = "1.0";
+            const string hotfixVersion = "1.0.1";
+
+            fixture.MakeACommit("init master");
+            fixture.ApplyTag(firstVersion);
+            fixture.MakeACommit("hotfix");
+            fixture.ApplyTag(hotfixVersion);
+            fixture.BranchTo("develop");
+            fixture.MakeACommit("new feature");
+            fixture.Checkout(hotfixVersion);
+            fixture.BranchTo("tags/1.0.1");
+
+            fixture.AssertFullSemver(hotfixVersion);
+        }
     }
 }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs

@@ -30,7 +30,7 @@ internal IEnumerable<BaseVersion> GetTaggedVersions(Branch currentBranch, DateTi
         {
             var allTags = repositoryMetadataProvider.GetValidVersionTags(Context.Configuration.GitTagPrefix, olderThan);
 
-            var tagsOnBranch = currentBranch
+            var taggedVersions = currentBranch
                 .Commits
                 .SelectMany(commit => { return allTags.Where(t => IsValidTag(t.Item1, commit)); })
                 .Select(t =>
@@ -40,11 +40,12 @@ internal IEnumerable<BaseVersion> GetTaggedVersions(Branch currentBranch, DateTi
 
                     return null;
                 })
-                .Where(a => a != null)
-                .Take(5)
+                .Where(versionTaggedCommit => versionTaggedCommit != null)
+                .Select(versionTaggedCommit => CreateBaseVersion(Context, versionTaggedCommit))
                 .ToList();
 
-            return tagsOnBranch.Select(t => CreateBaseVersion(Context, t));
+            var taggedVersionsOnCurrentCommit = taggedVersions.Where(version => !version.ShouldIncrement).ToList();
+            return taggedVersionsOnCurrentCommit.Any() ? taggedVersionsOnCurrentCommit : taggedVersions;
         }
 
         private BaseVersion CreateBaseVersion(GitVersionContext context, VersionTaggedCommit version)