Make VersionPoint expose the commit sha

Author: nulltoken

GitFlowVersion/VersionOnMasterFinder.cs

@@ -19,7 +19,8 @@ public VersionPoint Execute(GitVersionContext context, DateTimeOffset olderThan)
                         {
                             Major = major,
                             Minor = minor,
-                            Timestamp = commit.When()
+                            Timestamp = commit.When(),
+                            CommitSha = commit.Sha,
                         };
                     }
                 }
@@ -34,7 +35,8 @@ public VersionPoint Execute(GitVersionContext context, DateTimeOffset olderThan)
                         {
                             Major = major,
                             Minor = minor,
-                            Timestamp = commit.When()
+                            Timestamp = commit.When(),
+                            CommitSha = commit.Sha,
                         };
                     }
                 }
@@ -44,9 +46,10 @@ public VersionPoint Execute(GitVersionContext context, DateTimeOffset olderThan)
             {
                 Major = 0,
                 Minor = 1,
-                Timestamp = DateTimeOffset.MinValue
+                Timestamp = DateTimeOffset.MinValue,
+                CommitSha = null,
             };
         }
 
     }
-}
+}

GitFlowVersion/VersionPoint.cs

@@ -7,5 +7,6 @@ class VersionPoint
         public int Major;
         public int Minor;
         public DateTimeOffset Timestamp;
+        public string CommitSha;
     }
-}
+}

Tests/Mocks/MockCommit.cs

@@ -6,9 +6,9 @@
 [DebuggerDisplay("{DebuggerDisplay}")]
 public class MockCommit:Commit
 {
-    public MockCommit()
+    public MockCommit(ObjectId id = null)
     {
-        idEx = new ObjectId(Guid.NewGuid().ToString().Replace("-", "")+ "00000000");
+        idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "")+ "00000000");
         MessageEx = "";
         ParentsEx = new List<Commit> { null };
     }
@@ -38,4 +38,4 @@ string DebuggerDisplay
             return MessageEx;
         }
     }
-}
+}

Tests/Mocks/MockMergeCommit.cs

@@ -1,6 +1,8 @@
+using LibGit2Sharp;
+
 public class MockMergeCommit : MockCommit
 {
-    public MockMergeCommit()
+    public MockMergeCommit(ObjectId id = null) : base(id)
     {
         ParentsEx.Add(null);
     }

Tests/VersionOnMasterFinderTests.Should_find_previous_commit_that_was_at_least_a_minor_bump.approved.txt

@@ -1,5 +1,6 @@
 {
     "Major": 0,
     "Minor": 3,
-    "Timestamp": "2000-10-09T23:59:58Z"
+    "Timestamp": "2000-10-09T23:59:58Z",
+    "CommitSha": "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
 }

Tests/VersionOnMasterFinderTests.cs

@@ -2,20 +2,23 @@
 using FluentDate;
 using FluentDateTimeOffset;
 using GitFlowVersion;
+using LibGit2Sharp;
 using NUnit.Framework;
 using ObjectApproval;
 
 [TestFixture]
 public class VersionOnMasterFinderTests
 {
-
     [Test]
     public void Should_find_previous_commit_that_was_at_least_a_minor_bump()
     {
         var finder = new VersionOnMasterFinder();
 
         var dateTime = new DateTimeOffset(2000, 10, 10,0,0,0,new TimeSpan(0));
         var signature = 2.Seconds().Before(dateTime).ToSignature();
+
+        const string sha = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef";
+
         var version = finder.Execute(new GitVersionContext
         {
             Repository = new MockRepository
@@ -24,7 +27,7 @@ public void Should_find_previous_commit_that_was_at_least_a_minor_bump()
                 {
                     new MockBranch("master")
                     {
-                        new MockMergeCommit
+                        new MockMergeCommit(new ObjectId(sha))
                         {
                             MessageEx = "Merge branch 'hotfix-0.3.0'",
                             CommitterEx = signature
@@ -43,7 +46,6 @@ public void Should_find_previous_commit_that_was_at_least_a_minor_bump()
                 }
             }
         }, 1.Seconds().Ago());
-        ObjectApprover.VerifyWithJson(version, Scrubbers.GuidScrubber);
+        ObjectApprover.VerifyWithJson(version);
     }
-
-}
+}