Because we allow remote branches to be searched, we need to lookup config without the remote name

Author: JakeGinnivan

src/GitVersionCore/BranchConfigurationCalculator.cs

@@ -15,7 +15,7 @@ public class BranchConfigurationCalculator
         /// </summary>
         public static BranchConfig GetBranchConfiguration(GitVersionContext context, Branch targetBranch, IList<Branch> excludedInheritBranches = null)
         {
-            var matchingBranches = context.FullConfiguration.GetConfigForBranch(targetBranch.FriendlyName);
+            var matchingBranches = context.FullConfiguration.GetConfigForBranch(targetBranch.NameWithoutRemote());
 
             if (matchingBranches == null)
             {

src/GitVersionCore/GitRepoMetadataProvider.cs

@@ -225,7 +225,7 @@ List<BranchCommit> GetMergeCommitsForBranch(Branch branch, Branch[] excludedBran
                 return mergeBaseCommitsCache[branch];
             }
 
-            var currentBranchConfig = configuration.GetConfigForBranch(branch.FriendlyName);
+            var currentBranchConfig = configuration.GetConfigForBranch(branch.NameWithoutRemote());
             var regexesToCheck = currentBranchConfig == null
                 ? new [] { ".*" } // Match anything if we can't find a branch config
                 : currentBranchConfig.SourceBranches.Select(sb => configuration.Branches[sb].Regex);

src/GitVersionCore/IncrementStrategyFinder.cs

@@ -129,7 +129,7 @@ private static Regex CreateRegex(string pattern)
 
         public static VersionField FindDefaultIncrementForBranch( GitVersionContext context, string branch = null )
         {
-            var config = context.FullConfiguration.GetConfigForBranch(branch ?? context.CurrentBranch.FriendlyName);
+            var config = context.FullConfiguration.GetConfigForBranch(branch ?? context.CurrentBranch.NameWithoutRemote());
             if ( config?.Increment != null && config.Increment != IncrementStrategy.Inherit )
             {
                 return config.Increment.Value.ToVersionField();