Merge pull request #39 from GitTools/pr/checkout-bug

Fix checkout bug in GitRepositoryHelper

Author: asbjornu

appveyor.yml

@@ -1,6 +1,6 @@
 install:
   - choco install gitversion.portable -pre -y
-  - cinst gitlink -pre -y
+  - cinst gitlink -y
 
 platform:
   - Any CPU

src/GitTools.Core/GitTools.Core.Shared/Git/Helpers/GitRepositoryHelper.cs

@@ -139,7 +139,17 @@ static void EnsureLocalBranchExistsForCurrentBranch(Repository repo, string curr
             var isRef = currentBranch.Contains("refs");
             var isBranch = currentBranch.Contains("refs/heads");
             var localCanonicalName = !isRef ? "refs/heads/" + currentBranch : isBranch ? currentBranch : currentBranch.Replace("refs/", "refs/heads/");
+
             var repoTip = repo.Head.Tip;
+            
+            // We currently have the rep.Head of the *default* branch, now we need to look up the right one
+            var originCanonicalName = string.Format("origin/{0}", currentBranch);
+            var originBranch = repo.Branches[originCanonicalName];
+            if (originBranch != null)
+            {
+                repoTip = originBranch.Tip;
+            }
+
             var repoTipId = repoTip.Id;
 
             if (repo.Branches.All(b => b.CanonicalName != localCanonicalName))