Use context commit instead of branch tip

Author: distantcam

GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs

@@ -10,18 +10,18 @@ protected SemanticVersion FindVersion(
             BranchType branchType)
         {
             var ancestor = FindCommonAncestorWithDevelop(context.Repository, context.CurrentBranch, branchType);
-            
+
             if (!IsThereAnyCommitOnTheBranch(context.Repository, context.CurrentBranch))
             {
                 var developVersionFinder = new DevelopVersionFinder();
                 return developVersionFinder.FindVersion(context);
             }
 
             var versionOnMasterFinder = new VersionOnMasterFinder();
-            var versionFromMaster = versionOnMasterFinder.Execute(context, context.CurrentBranch.Tip.Committer.When);
+            var versionFromMaster = versionOnMasterFinder.Execute(context, context.CurrentCommit.Committer.When);
 
             var numberOfCommitsOnBranchSinceCommit = NumberOfCommitsOnBranchSinceCommit(context, ancestor);
-            var sha = context.CurrentBranch.Tip.Sha;
+            var sha = context.CurrentCommit.Sha;
             var releaseDate = ReleaseDateFinder.Execute(context.Repository, sha, 0);
             var preReleaseTag = context.CurrentBranch.Name
                 .TrimStart(branchType.ToString() + '-')
@@ -89,4 +89,4 @@ public bool IsThereAnyCommitOnTheBranch(IRepository repo, Branch branch)
             return true;
         }
     }
-}
+}

GitVersionCore/GitFlow/BranchFinders/DevelopVersionFinder.cs

@@ -8,7 +8,7 @@ class DevelopVersionFinder
         public SemanticVersion FindVersion(GitVersionContext context)
         {
             var versionOnMasterFinder = new VersionOnMasterFinder();
-            var tip = context.CurrentBranch.Tip;
+            var tip = context.CurrentCommit;
             var versionFromMaster = versionOnMasterFinder.Execute(context, tip.When());
 
             var f = new CommitFilter
@@ -32,6 +32,5 @@ public SemanticVersion FindVersion(GitVersionContext context)
             };
             return semanticVersion;
         }
-
     }
 }

GitVersionCore/GitFlow/BranchFinders/OptionallyTaggedBranchVersionFinderBase.cs

@@ -30,7 +30,7 @@ protected SemanticVersion FindVersion(
 
             var tagVersion = RetrieveMostRecentOptionalTagVersion(context.Repository, version, context.CurrentBranch.Commits.Take(nbHotfixCommits + 1));
 
-            var sha = context.CurrentBranch.Tip.Sha;
+            var sha = context.CurrentCommit.Sha;
             var releaseDate = ReleaseDateFinder.Execute(context.Repository, sha, version.Patch);
             var semanticVersion = new SemanticVersion
             {
@@ -167,4 +167,4 @@ int NumberOfCommitsInBranchNotKnownFromBaseBranch(
             return repo.Commits.QueryBy(filter).Count();
         }
     }
-}
+}

GitVersionCore/GitFlow/GitFlowVersionFinder.cs

@@ -6,7 +6,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
         {
             if (context.CurrentBranch.IsMaster())
             {
-                return new MasterVersionFinder().FindVersion(context.Repository, context.CurrentBranch.Tip);
+                return new MasterVersionFinder().FindVersion(context.Repository, context.CurrentCommit);
             }
 
             if (context.CurrentBranch.IsHotfix())
@@ -31,12 +31,10 @@ public SemanticVersion FindVersion(GitVersionContext context)
 
             if (context.CurrentBranch.IsSupport())
             {
-                return new SupportVersionFinder().FindVersion(context.Repository, context.CurrentBranch.Tip);
+                return new SupportVersionFinder().FindVersion(context.Repository, context.CurrentCommit);
             }
 
             return new FeatureVersionFinder().FindVersion(context);
         }
     }
-
-
 }

GitVersionCore/GitHubFlow/BuildNumberCalculator.cs

@@ -23,11 +23,11 @@ public SemanticVersion GetBuildNumber(GitVersionContext context)
             var commitsSinceLastRelease = NumberOfCommitsOnBranchSinceCommit(context, commit);
             var semanticVersion = nextSemverCalculator.NextVersion();
 
-            var sha = context.CurrentBranch.Tip.Sha;
+            var sha = context.CurrentCommit.Sha;
             var releaseDate = ReleaseDateFinder.Execute(context.Repository, sha, semanticVersion.Patch);
 
             // TODO Need a way of setting this in a cross cutting way
-            semanticVersion.BuildMetaData = new SemanticVersionBuildMetaData(commitsSinceLastRelease, 
+            semanticVersion.BuildMetaData = new SemanticVersionBuildMetaData(commitsSinceLastRelease,
                 context.CurrentBranch.Name, releaseDate);
             if (context.CurrentBranch.IsPullRequest())
             {

GitVersionCore/GitHubFlow/LastTaggedReleaseFinder.cs

@@ -31,7 +31,7 @@ VersionTaggedCommit GetVersion(GitVersionContext context)
             })
                 .Where(a => a != null)
                 .ToArray();
-            var olderThan = context.CurrentBranch.Tip.Committer.When;
+            var olderThan = context.CurrentCommit.Committer.When;
             var lastTaggedCommit =
                 context.CurrentBranch.Commits.FirstOrDefault(c => c.Committer.When <= olderThan && tags.Any(a => a.Commit == c));
 

GitVersionCore/GitVersionContext.cs

@@ -16,9 +16,11 @@ public GitVersionContext(IRepository repository, Branch currentBranch)
         {
             Repository = repository;
             CurrentBranch = currentBranch;
+            CurrentCommit = CurrentBranch.Tip;
         }
 
         public IRepository Repository { get; private set; }
         public Branch CurrentBranch { get; private set; }
+        public Commit CurrentCommit { get; private set; }
     }
 }

GitVersionCore/GitVersionFinder.cs

@@ -39,7 +39,7 @@ void EnsureHeadIsNotDetached(GitVersionContext context)
                 return;
             }
 
-            var message = string.Format("It looks like the branch being examined is a detached Head pointing to commit '{0}'. Without a proper branch name GitVersion cannot determine the build version.", context.CurrentBranch.Tip.Id.ToString(7));
+            var message = string.Format("It looks like the branch being examined is a detached Head pointing to commit '{0}'. Without a proper branch name GitVersion cannot determine the build version.", context.CurrentCommit.Id.ToString(7));
             throw new ErrorException(message);
         }
 
@@ -54,4 +54,4 @@ void EnsureLocalBranchExists(IRepository repository, string branchName)
             throw new ErrorException(string.Format("This repository doesn't contain a branch named '{0}'. Please create one. Existing branches: {1}", branchName, existingBranches));
         }
     }
-}
+}