Small changes based on feedback

Author: JakeGinnivan

GitVersionCore/ExecuteCore.cs

@@ -9,9 +9,8 @@ public static class ExecuteCore
         public static VersionVariables ExecuteGitVersion(IFileSystem fileSystem, string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId)
         {
             // Normalise if we are running on build server
-            var normaliseGitDirectory = BuildServerList.GetApplicableBuildServers().Any();
-            var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, workingDirectory, normaliseGitDirectory);
-            gitPreparer.Initialise();
+            var gitPreparer = new GitPreparer(targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, workingDirectory);
+            gitPreparer.Initialise(BuildServerList.GetApplicableBuildServers().Any());
             var dotGitDirectory = gitPreparer.GetDotGitDirectory();
             var projectRoot = gitPreparer.GetProjectRootDirectory();
             Logger.WriteInfo(string.Format("Project root is: " + projectRoot));

GitVersionCore/GitPreparer.cs

@@ -13,17 +13,15 @@ public class GitPreparer
         string targetBranch;
         bool noFetch;
         string targetPath;
-        readonly bool normaliseGitDirectory;
 
-        public GitPreparer(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string targetPath, bool normaliseGitDirectory)
+        public GitPreparer(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string targetPath)
         {
             this.targetUrl = targetUrl;
             this.dynamicRepositoryLocation = dynamicRepositoryLocation;
             this.authentication = authentication;
             this.targetBranch = targetBranch;
             this.noFetch = noFetch;
             this.targetPath = targetPath;
-            this.normaliseGitDirectory = normaliseGitDirectory;
         }
 
         public bool IsDynamicGitRepository
@@ -33,7 +31,7 @@ public bool IsDynamicGitRepository
 
         public string DynamicGitRepositoryPath { get; private set; }
 
-        public void Initialise()
+        public void Initialise(bool normaliseGitDirectory)
         {
             if (string.IsNullOrWhiteSpace(targetUrl))
             {

GitVersionExe.Tests/GitPreparerTests.cs

@@ -55,8 +55,8 @@ public void WorksCorrectlyWithRemoteRepository(string branchName, string expecte
                     arguments.TargetBranch = branchName;
                 }
 
-                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath, false);
-                gitPreparer.Initialise();
+                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath);
+                gitPreparer.Initialise(false);
                 dynamicRepositoryPath = gitPreparer.GetDotGitDirectory();
 
                 gitPreparer.IsDynamicGitRepository.ShouldBe(true);
@@ -100,12 +100,12 @@ public void UpdatesExistingDynamicRepository()
                     TargetBranch = "master"
                 };
 
-                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath, false);
-                gitPreparer.Initialise();
+                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath);
+                gitPreparer.Initialise(false);
                 dynamicRepositoryPath = gitPreparer.GetDotGitDirectory();
 
                 var newCommit = mainRepositoryFixture.Repository.MakeACommit();
-                gitPreparer.Initialise();
+                gitPreparer.Initialise(false);
 
                 using (var repository = new Repository(dynamicRepositoryPath))
                 {
@@ -147,8 +147,8 @@ public void PicksAnotherDirectoryNameWhenDynamicRepoFolderTaken()
                     TargetUrl = fixture.RepositoryPath
                 };
 
-                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath, false);
-                gitPreparer.Initialise();
+                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath);
+                gitPreparer.Initialise(false);
 
                 gitPreparer.IsDynamicGitRepository.ShouldBe(true);
                 gitPreparer.DynamicGitRepositoryPath.ShouldBe(expectedDynamicRepoLocation + "_1\\.git");
@@ -174,7 +174,7 @@ public void WorksCorrectlyWithLocalRepository()
             TargetPath = tempDir
         };
 
-        var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath, false);
+        var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath);
         var dynamicRepositoryPath = gitPreparer.GetDotGitDirectory();
 
         dynamicRepositoryPath.ShouldBe(null);
@@ -184,8 +184,8 @@ public void WorksCorrectlyWithLocalRepository()
     [Test]
     public void UsesGitVersionConfigWhenCreatingDynamicRepository()
     {
-        string localRepoPath = PathHelper.GetTempPath();
-        string repoBasePath = Path.GetDirectoryName(PathHelper.GetTempPath());
+        var localRepoPath = PathHelper.GetTempPath();
+        var repoBasePath = Path.GetDirectoryName(PathHelper.GetTempPath());
         Directory.CreateDirectory(localRepoPath);
 
         try