Merge pull request #626 from orjan/should-not-checkout-branch-on-update

Should not checkout branch on update

Author: JakeGinnivan

src/GitVersionCore.Tests/GitHelperTests.cs

@@ -100,5 +100,34 @@ public void UpdatesCurrentBranch()
                 }
             }
         }
+
+        [Test]
+        public void ShouldNotChangeBranchWhenNormalizingTheDirectory()
+        {
+            using (var fixture = new EmptyRepositoryFixture(new Config()))
+            {
+                fixture.Repository.MakeATaggedCommit("v1.0.0");
+
+                fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
+                var lastCommitOnDevelop = fixture.Repository.MakeACommit();
+
+                fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
+                fixture.Repository.MakeACommit();
+
+                using (var localFixture = fixture.CloneRepository())
+                {
+                    localFixture.Repository.Checkout("origin/develop");
+
+                    // Another commit on feature/foo will force an update
+                    fixture.Checkout("feature/foo");
+                    fixture.Repository.MakeACommit();
+
+                    GitHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new Authentication(), noFetch: false, currentBranch: null);
+
+                    localFixture.Repository.DumpGraph();
+                    localFixture.Repository.Head.Tip.Sha.ShouldBe(lastCommitOnDevelop.Sha);
+                }
+            }
+        }
     }
 }

src/GitVersionCore/BuildServers/GitHelper.cs

@@ -279,7 +279,6 @@ static void CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(Repository repo, s
                     var remoteRefTipId = remotedirectReference.Target.Id;
                     Logger.WriteInfo(string.Format("Updating local ref '{0}' to point at {1}.", localRef.CanonicalName, remoteRefTipId));
                     repo.Refs.UpdateTarget(localRef, remoteRefTipId);
-                    repo.Checkout(branchName);
                     continue;
                 }