Using PeeledTarget instead of Target

JakeGinnivan · JakeGinnivan · commit 182782e22740 · 2015-02-15T10:04:19.000Z
diff --git a/GitVersionCore/GitVersionContext.cs b/GitVersionCore/GitVersionContext.cs
@@ -26,7 +26,7 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
                 throw new InvalidOperationException("Need a branch to operate on");
 
             CurrentCommit = currentBranch.Tip;
-            IsCurrentCommitTagged = repository.Tags.Any(t => t.Target == CurrentCommit);
+            IsCurrentCommitTagged = repository.Tags.Any(t => t.PeeledTarget() == CurrentCommit);
 
             if (currentBranch.IsDetachedHead())
             {
diff --git a/GitVersionCore/VersionCalculation/BaseVersionCalculators/HighestTagBaseVersionStrategy.cs b/GitVersionCore/VersionCalculation/BaseVersionCalculators/HighestTagBaseVersionStrategy.cs
@@ -34,7 +34,7 @@ bool GetVersion(GitVersionContext context, out VersionTaggedCommit versionTagged
                     SemanticVersion version;
                     if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))
                     {
-                        return new VersionTaggedCommit((Commit)t.Target, version, t.Name);
+                        return new VersionTaggedCommit((Commit)t.PeeledTarget(), version, t.Name);
                     }
                     return null;
                 })
diff --git a/GitVersionCore/VersioningModes/ContinuousDeliveryMode.cs b/GitVersionCore/VersioningModes/ContinuousDeliveryMode.cs
@@ -15,7 +15,7 @@ static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVers
         {
             if (applicableTagsInDescendingOrder.Any())
             {
-                var taggedCommit = applicableTagsInDescendingOrder.First().Target;
+                var taggedCommit = applicableTagsInDescendingOrder.First().PeeledTarget();
                 var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name, context.Configuration.GitTagPrefix)).FirstOrDefault();
                 if (preReleaseVersion != null)
                 {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co`
`26`	`26`	`throw new InvalidOperationException("Need a branch to operate on");`
`27`	`27`
`28`	`28`	`CurrentCommit = currentBranch.Tip;`
`29`		`- IsCurrentCommitTagged = repository.Tags.Any(t => t.Target == CurrentCommit);`
	`29`	`+ IsCurrentCommitTagged = repository.Tags.Any(t => t.PeeledTarget() == CurrentCommit);`
`30`	`30`
`31`	`31`	`if (currentBranch.IsDetachedHead())`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ bool GetVersion(GitVersionContext context, out VersionTaggedCommit versionTagged`
`34`	`34`	`SemanticVersion version;`
`35`	`35`	`if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))`
`36`	`36`	`{`
`37`		`- return new VersionTaggedCommit((Commit)t.Target, version, t.Name);`
	`37`	`+ return new VersionTaggedCommit((Commit)t.PeeledTarget(), version, t.Name);`
`38`	`38`	`}`
`39`	`39`	`return null;`
`40`	`40`	`})`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVers`
`15`	`15`	`{`
`16`	`16`	`if (applicableTagsInDescendingOrder.Any())`
`17`	`17`	`{`
`18`		`- var taggedCommit = applicableTagsInDescendingOrder.First().Target;`
	`18`	`+ var taggedCommit = applicableTagsInDescendingOrder.First().PeeledTarget();`
`19`	`19`	`var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name, context.Configuration.GitTagPrefix)).FirstOrDefault();`
`20`	`20`	`if (preReleaseVersion != null)`
`21`	`21`	`{`