Fix not picking up config file for dynamic repos

JakeGinnivan · JakeGinnivan · commit 3fa14ba0e0ce · 2015-05-28T21:49:43.000+01:00
diff --git a/GitVersionCore/Configuration/ConfigurationProvider.cs b/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -6,9 +6,9 @@ namespace GitVersion
 
     public class ConfigurationProvider
     {
-        public static Config Provide(string gitDirectory, IFileSystem fileSystem)
+        public static Config Provide(string workingDirectory, IFileSystem fileSystem)
         {
-            var configFilePath = GetConfigFilePath(gitDirectory);
+            var configFilePath = GetConfigFilePath(workingDirectory);
 
             if (fileSystem.Exists(configFilePath))
             {
@@ -33,9 +33,9 @@ public static string GetEffectiveConfigAsString(string gitDirectory, IFileSystem
             return stringBuilder.ToString();
         }
 
-        public static void WriteSample(string gitDirectory, IFileSystem fileSystem)
+        public static void WriteSample(string workingDirectory, IFileSystem fileSystem)
         {
-            var configFilePath = GetConfigFilePath(gitDirectory);
+            var configFilePath = GetConfigFilePath(workingDirectory);
 
             if (!fileSystem.Exists(configFilePath))
             {
@@ -51,9 +51,9 @@ public static void WriteSample(string gitDirectory, IFileSystem fileSystem)
             }
         }
 
-        static string GetConfigFilePath(string gitDirectory)
+        static string GetConfigFilePath(string workingDirectory)
         {
-            return Path.Combine(Directory.GetParent(gitDirectory).FullName, "GitVersionConfig.yaml");
+            return Path.Combine(Directory.GetParent(workingDirectory).FullName, "GitVersionConfig.yaml");
         }
     }
 }
diff --git a/GitVersionExe/SpecifiedArgumentRunner.cs b/GitVersionExe/SpecifiedArgumentRunner.cs
@@ -26,7 +26,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
             }
             VersionVariables variables;
             var versionFinder = new GitVersionFinder();
-            var configuration = ConfigurationProvider.Provide(dotGitDirectory, fileSystem);
+            var configuration = ConfigurationProvider.Provide(arguments.TargetPath, fileSystem);
 
             using (var repo = RepositoryLoader.GetRepo(dotGitDirectory))
             {

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ namespace GitVersion`
`6`	`6`
`7`	`7`	`public class ConfigurationProvider`
`8`	`8`	`{`
`9`		`- public static Config Provide(string gitDirectory, IFileSystem fileSystem)`
	`9`	`+ public static Config Provide(string workingDirectory, IFileSystem fileSystem)`
`10`	`10`	`{`
`11`		`- var configFilePath = GetConfigFilePath(gitDirectory);`
	`11`	`+ var configFilePath = GetConfigFilePath(workingDirectory);`
`12`	`12`
`13`	`13`	`if (fileSystem.Exists(configFilePath))`
`14`	`14`	`{`
`@@ -33,9 +33,9 @@ public static string GetEffectiveConfigAsString(string gitDirectory, IFileSystem`
`33`	`33`	`return stringBuilder.ToString();`
`34`	`34`	`}`
`35`	`35`
`36`		`- public static void WriteSample(string gitDirectory, IFileSystem fileSystem)`
	`36`	`+ public static void WriteSample(string workingDirectory, IFileSystem fileSystem)`
`37`	`37`	`{`
`38`		`- var configFilePath = GetConfigFilePath(gitDirectory);`
	`38`	`+ var configFilePath = GetConfigFilePath(workingDirectory);`
`39`	`39`
`40`	`40`	`if (!fileSystem.Exists(configFilePath))`
`41`	`41`	`{`
`@@ -51,9 +51,9 @@ public static void WriteSample(string gitDirectory, IFileSystem fileSystem)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- static string GetConfigFilePath(string gitDirectory)`
	`54`	`+ static string GetConfigFilePath(string workingDirectory)`
`55`	`55`	`{`
`56`		`- return Path.Combine(Directory.GetParent(gitDirectory).FullName, "GitVersionConfig.yaml");`
	`56`	`+ return Path.Combine(Directory.GetParent(workingDirectory).FullName, "GitVersionConfig.yaml");`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)`
`26`	`26`	`}`
`27`	`27`	`VersionVariables variables;`
`28`	`28`	`var versionFinder = new GitVersionFinder();`
`29`		`- var configuration = ConfigurationProvider.Provide(dotGitDirectory, fileSystem);`
	`29`	`+ var configuration = ConfigurationProvider.Provide(arguments.TargetPath, fileSystem);`
`30`	`30`
`31`	`31`	`using (var repo = RepositoryLoader.GetRepo(dotGitDirectory))`
`32`	`32`	`{`