dont bump PreReleaseTag on specific commit

fixes #211

Author: SimonCropp

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/Helpers/Lg2sHelperBase.cs

@@ -105,12 +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, sign, "foo");
+        repo.ApplyTag(tagName, repo.Head.Tip.Id.Sha, sign, "foo");
     }
 }