Merge pull request #746 from JakeGinnivan/AllowBuildRemoteTag

Fix branch normalisation when building a non-tip tag. Fixes #690

Author: JakeGinnivan

src/GitVersionCore.Tests/GitHelperTests.cs

@@ -27,6 +27,33 @@ public void NormalisationOfPullRequestsWithFetch()
                 }
             }
         }
+        [Test]
+        public void NormalisationOfTag()
+        {
+            using (var fixture = new EmptyRepositoryFixture(new Config()))
+            {
+                fixture.Repository.MakeACommit();
+
+                fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
+                fixture.Repository.MakeACommit();
+
+                fixture.BranchTo("release/2.0.0");
+                fixture.MakeACommit();
+                fixture.MakeATaggedCommit("2.0.0-rc.1");
+                fixture.Checkout("master");
+                fixture.MergeNoFF("release/2.0.0");
+                fixture.Repository.Branches.Remove(fixture.Repository.FindBranch("release/2.0.0"));
+                var remoteTagSha = fixture.Repository.Tags["2.0.0-rc.1"].Target.Sha;
+                
+                using (var localFixture = fixture.CloneRepository())
+                {
+                    localFixture.Checkout(remoteTagSha);
+                    GitHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new Authentication(), noFetch: false, currentBranch: string.Empty);
+
+                    localFixture.AssertFullSemver("2.0.0-rc.1");
+                }
+            }
+        }
 
         [Test]
         public void NormalisationOfPullRequestsWithoutFetch()

src/GitVersionCore.Tests/GitVersionCore.Tests.v2.ncrunchproject

@@ -1,4 +1,5 @@
-<ProjectConfiguration>
+<ProjectConfiguration>
+  <AutoDetectNugetBuildDependencies>true</AutoDetectNugetBuildDependencies>
   <BuildPriority>1000</BuildPriority>
   <CopyReferencedAssembliesToWorkspace>true</CopyReferencedAssembliesToWorkspace>
   <ConsiderInconclusiveTestsAsPassing>false</ConsiderInconclusiveTestsAsPassing>
@@ -22,6 +23,11 @@
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
   <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
   <BuildProcessArchitecture>x86</BuildProcessArchitecture>
+  <IgnoredTests>
+    <FixtureTestSelector>
+      <FixtureName>DocumentationTests</FixtureName>
+    </FixtureTestSelector>
+  </IgnoredTests>
   <AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.21.0.176\lib\net40\NativeBinaries\**.*;Resources\**.*</AdditionalFilesToInclude>
   <HiddenWarnings>PostBuildEventDisabled;CopyReferencedAssembliesToWorkspaceIsOn</HiddenWarnings>
 </ProjectConfiguration>

src/GitVersionCore/BuildServers/GitHelper.cs

@@ -210,9 +210,17 @@ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authent
                 throw new WarningException(message);
             }
 
-            var canonicalName = refs[0].CanonicalName;
+            var reference = refs[0];
+            var canonicalName = reference.CanonicalName;
             Logger.WriteInfo(string.Format("Found remote tip '{0}' pointing at the commit '{1}'.", canonicalName, headTipSha));
 
+            if (canonicalName.StartsWith("refs/tags"))
+            {
+                Logger.WriteInfo(string.Format("Checking out tag '{0}'", canonicalName));
+                repo.Checkout(reference.Target.Sha);
+                return;
+            }
+
             if (!canonicalName.StartsWith("refs/pull/") && !canonicalName.StartsWith("refs/pull-requests/"))
             {
                 var message = string.Format("Remote tip '{0}' from remote '{1}' doesn't look like a valid pull request.", canonicalName, remote.Url);