Merge pull request #211 from Particular/exactTagOnRelease

should get exact version from tag

Author: JakeGinnivan

AcceptanceTests/GitFlow/PatchScenarios.cs

@@ -20,7 +20,9 @@ public void PatchLatestReleaseExample()
                 fixture.Repository.MakeACommit();
                 fixture.AssertFullSemver("1.2.1-beta.1+1");
                 fixture.Repository.ApplyTag("1.2.1-beta.1");
-                fixture.AssertFullSemver("1.2.1-beta.2+1");
+                fixture.AssertFullSemver("1.2.1-beta.1+1");
+                fixture.Repository.MakeACommit();
+                fixture.AssertFullSemver("1.2.1-beta.2+2");
 
                 // Merge hotfix branch to master
                 fixture.Repository.Checkout("master");

AcceptanceTests/GitFlow/WikiScenarios.cs

@@ -74,9 +74,13 @@ public void MinorReleaseExample()
                 fixture.Repository.MakeACommit();
                 fixture.ExecuteGitVersion().OutputVariables[VariableProvider.FullSemVer].ShouldBe("1.3.0-beta.1+1");
 
-                // Apply beta.0 tag
+                // Apply beta.0 tag should be exact tag
                 fixture.Repository.ApplyTag("1.3.0-beta.1");
-                fixture.ExecuteGitVersion().OutputVariables[VariableProvider.FullSemVer].ShouldBe("1.3.0-beta.2+1");
+                fixture.ExecuteGitVersion().OutputVariables[VariableProvider.FullSemVer].ShouldBe("1.3.0-beta.1+1");
+
+                // Make a commit after a tag should bump up the beta
+                fixture.Repository.MakeACommit();
+                fixture.ExecuteGitVersion().OutputVariables[VariableProvider.FullSemVer].ShouldBe("1.3.0-beta.2+2");
 
                 // Merge release branch to master
                 fixture.Repository.Checkout("master");

GitVersionCore/GitFlow/BranchFinders/OptionallyTaggedBranchVersionFinderBase.cs

@@ -44,8 +44,12 @@ protected SemanticVersion FindVersion(
 
             if (tagVersion != null)
             {
-                tagVersion.PreReleaseTag.Number++;
-                semanticVersion.PreReleaseTag = tagVersion.PreReleaseTag;
+                //If the tag is on the eact commit then dont bump the PreReleaseTag 
+                if (context.CurrentCommit.Sha != tagVersion.Commit.Sha)
+                {
+                    tagVersion.SemVer.PreReleaseTag.Number++;
+                }
+                semanticVersion.PreReleaseTag = tagVersion.SemVer.PreReleaseTag;
             }
 
             return semanticVersion;
@@ -71,7 +75,7 @@ bool IsMostRecentCommitTagged(GitVersionContext context, out SemanticVersion ver
             return false;
         }
 
-        SemanticVersion RetrieveMostRecentOptionalTagVersion(
+        VersionTaggedCommit RetrieveMostRecentOptionalTagVersion(
             IRepository repository, SemanticVersion branchVersion, IEnumerable<Commit> take)
         {
             foreach (var commit in take)
@@ -91,7 +95,7 @@ SemanticVersion RetrieveMostRecentOptionalTagVersion(
                         continue;
                     }
 
-                    return version;
+                    return new VersionTaggedCommit(commit, version);
                 }
             }
 

Tests/BranchFinders/ReleaseTests.Tag_on_commit_should_be_exact_tag.approved.txt

@@ -0,0 +1,21 @@
+{
+    "Major": 5,
+    "Minor": 0,
+    "Patch": 0,
+    "PreReleaseTag": {
+        "Name": "beta",
+        "Number": 2
+    },
+    "BuildMetaData": {
+        "CommitsSinceTag": 1,
+        "Branch": "release-5.0.0",
+        "ReleaseDate": {
+            "OriginalDate": "<date replaced>",
+            "OriginalCommitSha": "000000000000000000000000000000000000000",
+            "Date": "<date replaced>",
+            "CommitSha": "000000000000000000000000000000000000000"
+        },
+        "Sha": "000000000000000000000000000000000000000",
+        "OtherMetaData": null
+    }
+}

Tests/BranchFinders/ReleaseTests.cs

@@ -1,6 +1,7 @@
 using GitVersion;
 using LibGit2Sharp;
 using NUnit.Framework;
+using ObjectApproval;
 
 [TestFixture]
 public class ReleaseTests : Lg2sHelperBase
@@ -39,4 +40,22 @@ public void EnsureAReleaseBranchNameDoesNotExposeAStability()
         }
     }
 
+    [Test]
+    public void Tag_on_commit_should_be_exact_tag()
+    {
+        var repoPath = Clone(ASBMTestRepoWorkingDirPath);
+        using (var repo = new Repository(repoPath))
+        {
+            // Create a release branch from the parent of current develop tip
+            repo.Branches.Add("release-5.0.0", "develop~").ForceCheckout();
+
+            AddOneCommitToHead(repo, "code");
+            AddTag(repo, "5.0.0-beta2");
+
+            var finder = new ReleaseVersionFinder();
+
+            var version = finder.FindVersion(new GitVersionContext(repo, repo.Head));
+            ObjectApprover.VerifyWithJson(version, Scrubbers.GuidAndDateScrubber);
+        }
+    }
 }

Tests/Helpers/Lg2sHelperBase.cs

@@ -105,4 +105,13 @@ protected static Commit AddOneCommitToHead(Repository repo, string type)
         var sign = Constants.SignatureNow();
         return repo.Commit(type + " commit", sign, sign);
     }
+
+    protected static void AddTag(Repository repo, string tagName)
+    {
+        var randomFile = Path.Combine(repo.Info.WorkingDirectory, Guid.NewGuid().ToString());
+        File.WriteAllText(randomFile, string.Empty);
+        repo.Index.Stage(randomFile);
+        var sign = Constants.SignatureNow();
+        repo.ApplyTag(tagName, repo.Head.Tip.Id.Sha, sign, "foo");
+    }
 }