Cache the commits which we look for commit messages in.

Author: JakeGinnivan

src/GitVersionCore/IncrementStrategyFinder.cs

@@ -15,6 +15,7 @@ public enum CommitMessageIncrementMode
 
     public static class IncrementStrategyFinder
     {
+        private static List<Commit> intermediateCommitCache;
         public const string DefaultMajorPattern = @"\+semver:\s?(breaking|major)";
         public const string DefaultMinorPattern = @"\+semver:\s?(feature|minor)";
         public const string DefaultPatchPattern = @"\+semver:\s?(fix|patch)";
@@ -53,7 +54,7 @@ public static class IncrementStrategyFinder
                 return null;
             }
 
-            var commits = GetIntermediateCommits(context.Repository, baseVersion.BaseVersionSource, context.CurrentCommit);
+            var commits = GetIntermediateCommits(context.Repository, baseVersion.BaseVersionSource, context.CurrentCommit, context.CurrentBranch);
 
             if (context.Configuration.CommitMessageIncrementing == CommitMessageIncrementMode.MergeMessageOnly)
             {
@@ -78,16 +79,34 @@ public static class IncrementStrategyFinder
             return null;
         }
 
-        private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Commit baseCommit, Commit headCommit)
+        private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Commit baseCommit, Commit headCommit, Branch currentBranch)
         {
-            var filter = new CommitFilter
+            if (baseCommit == null) yield break;
+
+            if (intermediateCommitCache == null)
+            {
+                var filter = new CommitFilter
+                {
+                    Since = currentBranch.Tip,
+                    Until = baseCommit,
+                    SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
+                };
+
+                intermediateCommitCache = repo.Commits.QueryBy(filter).ToList();
+            }
+
+            var found = false;
+            foreach (var commit in intermediateCommitCache)
             {
-                Since = headCommit,
-                Until = baseCommit,
-                SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
-            };
+                if (commit.Sha == baseCommit.Sha)
+                    found = true;
+
+                if (found)
+                    yield return commit;
 
-            return repo.Commits.QueryBy(filter);
+                if (commit.Sha == headCommit.Sha)
+                    yield break;
+            }
         }
 
         private static VersionField? FindIncrementFromMessage(string message, Regex major, Regex minor, Regex patch)