Current branch configuration should be set by the context

Author: JakeGinnivan

GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs

@@ -9,7 +9,6 @@ protected SemanticVersion FindVersion(
             GitVersionContext context,
             BranchType branchType)
         {
-            context.CurrentBranchConfig = context.Configuration.Branches["develop"];
             var ancestor = FindCommonAncestorWithDevelop(context.Repository, context.CurrentBranch, branchType);
 
             if (!IsThereAnyCommitOnTheBranch(context.Repository, context.CurrentBranch))

GitVersionCore/GitFlow/GitFlowVersionFinder.cs

@@ -11,19 +11,16 @@ public SemanticVersion FindVersion(GitVersionContext context)
 
             if (context.CurrentBranch.IsHotfix())
             {
-                context.CurrentBranchConfig = context.Configuration.Branches["release[/-]"];
                 return new HotfixVersionFinder().FindVersion(context);
             }
 
             if (context.CurrentBranch.IsRelease())
             {
-                context.CurrentBranchConfig = context.Configuration.Branches["release[/-]"];
                 return new ReleaseVersionFinder().FindVersion(context);
             }
 
             if (context.CurrentBranch.IsDevelop())
             {
-                context.CurrentBranchConfig = context.Configuration.Branches["develop"];
                 return new DevelopVersionFinder().FindVersion(context);
             }
 

GitVersionCore/GitVersionContext.cs

@@ -1,7 +1,9 @@
 namespace GitVersion
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Text.RegularExpressions;
     using LibGit2Sharp;
 
     /// <summary>
@@ -34,14 +36,16 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
             {
                 CurrentBranch = currentBranch;
             }
+
+            AssignBranchConfiguration();
         }
 
         public Config Configuration { get; private set; }
         public IRepository Repository { get; private set; }
         public Branch CurrentBranch { get; private set; }
         public Commit CurrentCommit { get; private set; }
 
-        public BranchConfig CurrentBranchConfig { get; set; }
+        public BranchConfig CurrentBranchConfig { get; private set; }
 
         readonly bool IsContextForTrackedBranchesOnly = true;
 
@@ -77,5 +81,23 @@ IEnumerable<Branch> GetBranchesContainingCommit(string commitSha)
                 yield return branch;
             }
         }
+
+        void AssignBranchConfiguration()
+        {
+            var matchingBranches = Configuration.Branches.Where(b => Regex.IsMatch(CurrentBranch.Name, b.Key)).ToArray();
+
+            if (matchingBranches.Length == 0)
+            {
+                CurrentBranchConfig = new BranchConfig();
+            }
+            else if (matchingBranches.Length == 1)
+            {
+                CurrentBranchConfig = matchingBranches[0].Value;
+            }
+            else
+            {
+                throw new Exception(string.Format("Multiple branch configurations match the current branch name of ''. Matching configurations: '{0}'", string.Join(", ", matchingBranches.Select(b => b.Key))));
+            }
+        }
     }
 }