Merge pull request #722 from okb/feature/peeled-target-blob

JakeGinnivan · JakeGinnivan · commit fce5ad8b6295 · 2015-12-01T21:27:23.000+08:00
A peeled target isn't necessarily a commit
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -124,7 +124,7 @@
     <Compile Include="VersionCalculation\BaseVersionCalculators\BaseVersion.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\ConfigNextVersionBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\TrackMergeTargetBaseVersionStrategy.cs" />
-    <Compile Include="VersionCalculation\BaseVersionCalculators\HighestTagBaseVersionStrategy.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculators\TaggedCommitVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\MergeMessageBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\VersionInBranchBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionStrategy.cs" />
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -30,7 +30,9 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
                     SemanticVersion version;
                     if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))
                     {
-                        return new VersionTaggedCommit((Commit)t.PeeledTarget(), version, t.Name);
+                        var commit = t.PeeledTarget() as Commit;
+                        if (commit != null)
+                            return new VersionTaggedCommit(commit, version, t.Name);
                     }
                     return null;
                 })

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)`
`30`	`30`	`SemanticVersion version;`
`31`	`31`	`if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))`
`32`	`32`	`{`
`33`		`- return new VersionTaggedCommit((Commit)t.PeeledTarget(), version, t.Name);`
	`33`	`+ var commit = t.PeeledTarget() as Commit;`
	`34`	`+ if (commit != null)`
	`35`	`+ return new VersionTaggedCommit(commit, version, t.Name);`
`34`	`36`	`}`
`35`	`37`	`return null;`
`36`	`38`	`})`