* ConfigurationProvider.cs refactoring: extracted WarnAboutAmbigousConfigFileSelection

Author: sergiorykov

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -1,12 +1,12 @@
 namespace GitVersion
 {
+    using GitVersion.Configuration.Init.Wizard;
+    using GitVersion.Helpers;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.IO;
     using System.Linq;
     using System.Text;
-    using GitVersion.Configuration.Init.Wizard;
-    using GitVersion.Helpers;
 
     public class ConfigurationProvider
     {
@@ -103,10 +103,27 @@ static void MigrateBranches(Config config)
             // Map of current names and previous names
             var dict = new Dictionary<string, string[]>
             {
-                { "hotfix(es)?[/-]", new [] { "hotfix[/-]" }},
-                { "features?[/-]", new [] { "feature[/-]", "feature(s)?[/-]" }},
-                { "releases?[/-]", new [] { "release[/-]" }},
-                { "dev(elop)?(ment)?$", new [] { "develop" }}
+                {"hotfix(es)?[/-]", new[]
+                    {
+                        "hotfix[/-]"
+                    }
+                },
+                {"features?[/-]", new[]
+                    {
+                        "feature[/-]",
+                        "feature(s)?[/-]"
+                    }
+                },
+                {"releases?[/-]", new[]
+                    {
+                        "release[/-]"
+                    }
+                },
+                {"dev(elop)?(ment)?$", new[]
+                    {
+                        "develop"
+                    }
+                }
             };
 
             foreach (var mapping in dict)
@@ -186,12 +203,12 @@ public static void Verify(GitPreparer gitPreparer, IFileSystem fileSystem)
             var workingDirectory = gitPreparer.WorkingDirectory;
             var projectRootDirectory = gitPreparer.GetProjectRootDirectory();
 
-            Verify(workingDirectory,projectRootDirectory, fileSystem);
+            Verify(workingDirectory, projectRootDirectory, fileSystem);
         }
 
         public static void Verify(string workingDirectory, string projectRootDirectory, IFileSystem fileSystem)
         {
-            if(fileSystem.PathsEqual(workingDirectory, projectRootDirectory))
+            if (fileSystem.PathsEqual(workingDirectory, projectRootDirectory))
             {
                 WarnAboutObsoleteConfigFile(workingDirectory, fileSystem);
                 return;
@@ -200,6 +217,11 @@ public static void Verify(string workingDirectory, string projectRootDirectory,
             WarnAboutObsoleteConfigFile(workingDirectory, fileSystem);
             WarnAboutObsoleteConfigFile(projectRootDirectory, fileSystem);
 
+            WarnAboutAmbigousConfigFileSelection(workingDirectory, projectRootDirectory, fileSystem);
+        }
+
+        private static void WarnAboutAmbigousConfigFileSelection(string workingDirectory, string projectRootDirectory, IFileSystem fileSystem)
+        {
             var workingConfigFile = GetConfigFilePath(workingDirectory, fileSystem);
             var projectRootConfigFile = GetConfigFilePath(projectRootDirectory, fileSystem);
 
@@ -280,4 +302,4 @@ public static void Init(string workingDirectory, IFileSystem fileSystem, IConsol
             }
         }
     }
-}
+}