Fixed issue where the sha checked out by build server can be updated

Author: JakeGinnivan

src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs

@@ -23,7 +23,7 @@ public void NormalisationOfPullRequestsWithFetch()
                     localFixture.Checkout(commit.Sha);
                     GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty);
 
-                    var normalisedPullBranch = localFixture.Repository.FindBranch("pull/3/merge");
+                    var normalisedPullBranch = localFixture.Repository.Branches["pull/3/merge"];
                     normalisedPullBranch.ShouldNotBe(null);
                 }
             }
@@ -51,24 +51,30 @@ public void NormalisationOfPullRequestsWithoutFetch()
         }
 
         [Test]
-        public void UpdatesLocalBranchesWhen()
+        public void NormalisationOfTag()
         {
             using (var fixture = new EmptyRepositoryFixture())
             {
                 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.Branches["release/2.0.0"]);
+                var remoteTagSha = fixture.Repository.Tags["2.0.0-rc.1"].Target.Sha;
+
                 using (var localFixture = fixture.CloneRepository())
                 {
-                    localFixture.Checkout("feature/foo");
-                    // Advance remote
-                    var advancedCommit = fixture.Repository.MakeACommit();
-                    GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: null);
+                    localFixture.Checkout(remoteTagSha);
+                    GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty);
 
-                    var normalisedBranch = localFixture.Repository.FindBranch("feature/foo");
-                    normalisedBranch.ShouldNotBe(null);
-                    normalisedBranch.Tip.Sha.ShouldBe(advancedCommit.Sha);
+                    localFixture.Repository.Head.FriendlyName.ShouldBe("(no branch)");
+                    localFixture.Repository.Head.Tip.Sha.ShouldBe(remoteTagSha);
                 }
             }
         }
@@ -89,13 +95,10 @@ public void UpdatesCurrentBranch()
                     var advancedCommit = fixture.Repository.MakeACommit();
                     Commands.Fetch((Repository)localFixture.Repository, localFixture.Repository.Network.Remotes["origin"].Name, new string[0], null, null);
                     localFixture.Repository.Checkout(advancedCommit.Sha);
-                    localFixture.Repository.DumpGraph();
-                    GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: "ref/heads/develop");
+                    GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: "refs/heads/develop");
 
-                    var normalisedBranch = localFixture.Repository.FindBranch("develop");
+                    var normalisedBranch = localFixture.Repository.Branches["develop"];
                     normalisedBranch.ShouldNotBe(null);
-                    fixture.Repository.DumpGraph();
-                    localFixture.Repository.DumpGraph();
                     normalisedBranch.Tip.Sha.ShouldBe(advancedCommit.Sha);
                     localFixture.Repository.Head.Tip.Sha.ShouldBe(advancedCommit.Sha);
                 }
@@ -125,10 +128,53 @@ public void ShouldNotChangeBranchWhenNormalizingTheDirectory()
 
                     GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: null);
 
-                    localFixture.Repository.DumpGraph();
                     localFixture.Repository.Head.Tip.Sha.ShouldBe(lastCommitOnDevelop.Sha);
                 }
             }
         }
+
+        [Test]
+        public void ShouldNotMoveLocalBranchWhenRemoteAdvances()
+        {
+            using (var fixture = new EmptyRepositoryFixture())
+            {
+                fixture.Repository.MakeACommit();
+
+                fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
+                fixture.Repository.MakeACommit();
+                using (var localFixture = fixture.CloneRepository())
+                {
+                    localFixture.Checkout("feature/foo");
+                    var expectedTip = localFixture.Repository.Head.Tip;
+                    // Advance remote
+                    fixture.Repository.MakeACommit();
+                    GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: null);
+
+                    var normalisedBranch = localFixture.Repository.Branches["feature/foo"];
+                    normalisedBranch.ShouldNotBe(null);
+                    normalisedBranch.Tip.Sha.ShouldBe(expectedTip.Sha);
+                }
+            }
+        }
+
+        [Test]
+        public void CheckedOutShaShouldNotChanged()
+        {
+            using (var fixture = new EmptyRepositoryFixture())
+            {
+                fixture.Repository.MakeACommit();
+                var commitToBuild = fixture.Repository.MakeACommit();
+                fixture.Repository.MakeACommit();
+
+                using (var localFixture = fixture.CloneRepository())
+                {
+                    localFixture.Repository.Checkout(commitToBuild);
+                    GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: "refs/heads/master");
+
+                    var normalisedBranch = localFixture.Repository.Branches["master"];
+                    normalisedBranch.Tip.Sha.ShouldBe(commitToBuild.Sha);
+                }
+            }
+        }
     }
 }

src/GitTools.Core.Tests/GitRepositoryTests.cs

@@ -71,7 +71,6 @@
     <Compile Include="..\SolutionAssemblyInfo.cs">
       <Link>Properties\SolutionAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="GitRepositoryTests.cs" />
     <Compile Include="Git\Extensions\AuthenticationInfoExtensionsTests.cs" />
     <Compile Include="Git\GitDirFinderTests.cs" />
     <Compile Include="Git\GitRepositoryHelperTests.cs" />

src/GitTools.Core.Tests/GitTools.Core.Tests.csproj

@@ -166,8 +166,7 @@ public static void DumpGraph(string workingDirectory, Action<string> writer = nu
                     e => output.AppendLineFormat("ERROR: {0}", e),
                     null,
                     "git",
-                    @"log --graph --format=""%h %cr %d"" --decorate --date=relative --all --remotes=*" + (maxCommits != null ? string.Format(" -n {0}", maxCommits) : null),
-                    //@"log --graph --abbrev-commit --decorate --date=relative --all --remotes=*",
+                    CreateGitLogArgs(maxCommits),
                     workingDirectory);
             }
             catch (FileNotFoundException exception)
@@ -190,5 +189,10 @@ public static void DumpGraph(string workingDirectory, Action<string> writer = nu
                 Console.Write(output.ToString());
             }
         }
+
+        public static string CreateGitLogArgs(int? maxCommits)
+        {
+            return @"log --graph --format=""%h %cr %d"" --decorate --date=relative --all --remotes=*" + (maxCommits != null ? string.Format(" -n {0}", maxCommits) : null);
+        }
     }
 }

src/GitTools.Core/GitTools.Core.Shared/Git/Extensions/LibGitExtensions.cs

@@ -0,0 +1,11 @@
+namespace GitTools.Git
+{
+    using System;
+
+    public class BugException : Exception
+    {
+        public BugException(string message) : base(message)
+        {
+        }
+    }
+}