Exclude base commit when getting intermediate commits. #974

GitTools · Jul 26, 2016 · 9756b9d · 9756b9d
1 parent de4544b
commit 9756b9d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/GitVersionCore.Tests/IntegrationTests/VersionBumpingScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/VersionBumpingScenarios.cs
@@ -43,4 +43,24 @@ public void CanUseCommitMessagesToBumpVersion()
         }
 
     }
+
+    [Test]
+    public void CanUseCommitMessagesToBumpVersionBaseVersionTagIsAppliedToSameCommit()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeACommit();
+            fixture.MakeATaggedCommit("1.0.0");
+            fixture.Repository.MakeACommit("+semver:minor");
+            fixture.AssertFullSemver("1.1.0+1");
+
+            fixture.ApplyTag("2.0.0");
+
+            fixture.Repository.MakeACommit("Hello");
+
+            // Default bump is patch
+
+            fixture.AssertFullSemver("2.0.1+1");
+        }
+    }
 }
diff --git a/src/GitVersionCore/IncrementStrategyFinder.cs b/src/GitVersionCore/IncrementStrategyFinder.cs
@@ -97,11 +97,11 @@ private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Comm
             var found = false;
             foreach (var commit in intermediateCommitCache)
             {
-                if (commit.Sha == baseCommit.Sha)
-                    found = true;
-
                 if (found)
                     yield return commit;
+
+                if (commit.Sha == baseCommit.Sha)
+                    found = true;
             }
         }