Use NameWithoutRemote() instead of FriendlyName

Author: asbjornu

src/GitVersionCore/BranchConfigurationCalculator.cs

@@ -192,14 +192,14 @@ static Branch[] CalculateWhenMultipleParents(IRepository repository, Commit curr
             }
             else if (branches.Count > 1)
             {
-                currentBranch = branches.FirstOrDefault(b => b.FriendlyName == "master") ?? branches.First();
+                currentBranch = branches.FirstOrDefault(b => b.NameWithoutRemote() == "master") ?? branches.First();
             }
             else
             {
                 var possibleTargetBranches = repository.Branches.Where(b => !b.IsRemote && b.Tip == parents[0]).ToList();
                 if (possibleTargetBranches.Count > 1)
                 {
-                    currentBranch = possibleTargetBranches.FirstOrDefault(b => b.FriendlyName == "master") ?? possibleTargetBranches.First();
+                    currentBranch = possibleTargetBranches.FirstOrDefault(b => b.NameWithoutRemote() == "master") ?? possibleTargetBranches.First();
                 }
                 else
                 {

src/GitVersionCore/GitVersionContext.cs

@@ -169,7 +169,8 @@ private static Branch GetTargetBranch(IRepository repository, string targetBranc
                     desiredBranch = repository?.Branches?
                         .SingleOrDefault(b =>
                             b.CanonicalName == targetBranch ||
-                            b.FriendlyName == targetBranch);
+                            b.FriendlyName == targetBranch ||
+                            b.NameWithoutRemote() == targetBranch);
 
                     // Failsafe in case the specified branch is invalid
                     desiredBranch = desiredBranch ?? repository.Head;

src/GitVersionCore/LibGitExtensions.cs

@@ -135,13 +135,7 @@ public static void CheckoutFilesIfExist(this IRepository repository, params stri
 
         public static Branch FindBranch(this IRepository repository, string branchName)
         {
-            var exact = repository.Branches.FirstOrDefault(x => x.FriendlyName == branchName);
-            if (exact != null)
-            {
-                return exact;
-            }
-
-            return repository.Branches.FirstOrDefault(x => x.FriendlyName == "origin/" + branchName);
+            return repository.Branches.FirstOrDefault(x => x.NameWithoutRemote() == branchName);
         }
 
         public static void DumpGraph(this IRepository repository, Action<string> writer = null, int? maxCommits = null)