Added test around commit message bumping and fixed test

Author: JakeGinnivan

src/GitVersionCore.Tests/Helpers/GitTestExtensions.cs

@@ -8,9 +8,9 @@ public static class GitTestExtensions
 {
     static int pad = 1;
 
-    public static Commit MakeACommit(this IRepository repository)
+    public static Commit MakeACommit(this IRepository repository, string commitMessage = null)
     {
-        return CreateFileAndCommit(repository, Guid.NewGuid().ToString());
+        return CreateFileAndCommit(repository, Guid.NewGuid().ToString(), commitMessage);
     }
 
     public static void MergeNoFF(this IRepository repository, string branch)
@@ -33,7 +33,7 @@ public static Commit[] MakeCommits(this IRepository repository, int numCommitsTo
             .ToArray();
     }
 
-    public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName)
+    public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string commitMessage = null)
     {
         var randomFile = Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
         if (File.Exists(randomFile))
@@ -47,7 +47,7 @@ public static Commit CreateFileAndCommit(this IRepository repository, string rel
 
         repository.Stage(randomFile);
 
-        return repository.Commit(string.Format("Test Commit for file '{0}'", relativeFileName),
+        return repository.Commit(string.Format("Test Commit for file '{0}' - {1}", relativeFileName, commitMessage),
             Constants.SignatureNow(), Constants.SignatureNow());
     }
 

src/GitVersionCore.Tests/IntegrationTests/VersionBumpingScenarios.cs

@@ -23,4 +23,22 @@ public void AppliedPrereleaseTagCausesBump()
             fixture.AssertFullSemver("1.0.0-pre.2+1");
         }
     }
+
+    [Test]
+    public void CanUseCommitMessagesToBumpVersion()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeACommit();
+            fixture.MakeATaggedCommit("1.0.0");
+            fixture.Repository.MakeACommit("+semver:minor");
+
+            fixture.AssertFullSemver("1.1.0+1");
+
+            fixture.Repository.MakeACommit("+semver:major");
+
+            fixture.AssertFullSemver("2.0.0+2");
+        }
+
+    }
 }

src/GitVersionCore/IncrementStrategyFinder.cs

@@ -54,7 +54,7 @@ public static class IncrementStrategyFinder
                 return null;
             }
 
-            var commits = GetIntermediateCommits(context.Repository, baseVersion.BaseVersionSource, context.CurrentCommit, context.CurrentBranch);
+            var commits = GetIntermediateCommits(context.Repository, baseVersion.BaseVersionSource, context.CurrentCommit);
 
             if (context.Configuration.CommitMessageIncrementing == CommitMessageIncrementMode.MergeMessageOnly)
             {
@@ -79,16 +79,15 @@ public static class IncrementStrategyFinder
             return null;
         }
 
-        private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Commit baseCommit, Commit headCommit, Branch currentBranch)
+        private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Commit baseCommit, Commit headCommit)
         {
             if (baseCommit == null) yield break;
 
-            if (intermediateCommitCache == null || intermediateCommitCache.Last() != currentBranch.Tip)
+            if (intermediateCommitCache == null || intermediateCommitCache.LastOrDefault() != headCommit)
             {
                 var filter = new CommitFilter
                 {
-                    Since = currentBranch.Tip,
-                    Until = baseCommit,
+                    Since = headCommit,
                     SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
                 };
 
@@ -103,9 +102,6 @@ private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Comm
 
                 if (found)
                     yield return commit;
-
-                if (commit.Sha == headCommit.Sha)
-                    yield break;
             }
         }