Added GitRootPath in the GitVersionOptions

GitTools · May 21, 2020 · be48ce3 · be48ce3
1 parent 488c06f
commit be48ce3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/GitVersionCore/Core/GitPreparer.cs b/src/GitVersionCore/Core/GitPreparer.cs
@@ -87,9 +87,7 @@ private string ResolveCurrentBranch()
         private void CleanupDuplicateOrigin()
         {
             var remoteToKeep = DefaultRemoteName;
-
-            var isDynamicRepo = !string.IsNullOrWhiteSpace(options.Value.DynamicGitRepositoryPath);
-            using var repo = new Repository(isDynamicRepo ? options.Value.DotGitDirectory : options.Value.ProjectRootDirectory);
+            using var repo = new Repository(options.Value.GitRootPath);
 
             // check that we have a remote that matches defaultRemoteName if not take the first remote
             if (!repo.Network.Remotes.Any(remote => remote.Name.Equals(DefaultRemoteName, StringComparison.InvariantCultureIgnoreCase)))

diff --git a/src/GitVersionCore/Core/GitRepository.cs b/src/GitVersionCore/Core/GitRepository.cs
@@ -11,11 +11,7 @@ public class GitRepository : IGitRepository
         private IRepository repositoryInstance => repositoryLazy.Value;
 
         public GitRepository(IOptions<GitVersionOptions> options)
-            : this(() =>
-            {
-                var isDynamicRepo = !string.IsNullOrWhiteSpace(options.Value.DynamicGitRepositoryPath);
-                return isDynamicRepo ? options.Value.DotGitDirectory : options.Value.ProjectRootDirectory;
-            })
+            : this(() => options.Value.GitRootPath)
         {
         }
 

diff --git a/src/GitVersionCore/Extensions/GitVersionOptionsExtensions.cs b/src/GitVersionCore/Extensions/GitVersionOptionsExtensions.cs
@@ -38,6 +38,14 @@ public static string GetProjectRootDirectory(this GitVersionOptions gitVersionOp
             return repository.Info.WorkingDirectory;
         }
 
+        public static string GetGitRootPath(this GitVersionOptions options)
+        {
+            var isDynamicRepo = !string.IsNullOrWhiteSpace(options.DynamicGitRepositoryPath);
+            var rootDirectory = isDynamicRepo ? options.DotGitDirectory : options.ProjectRootDirectory;
+
+            return rootDirectory;
+        }
+
         public static string GetDynamicGitRepositoryPath(this GitVersionOptions gitVersionOptions)
         {
             if (string.IsNullOrWhiteSpace(gitVersionOptions.RepositoryInfo.TargetUrl)) return null;

diff --git a/src/GitVersionCore/Model/GitVersionOptions.cs b/src/GitVersionCore/Model/GitVersionOptions.cs
@@ -11,19 +11,22 @@ public class GitVersionOptions
         private Lazy<string> dotGitDirectory;
         private Lazy<string> projectRootDirectory;
         private Lazy<string> dynamicGitRepositoryPath;
+        private Lazy<string> gitRootPath;
 
         public GitVersionOptions()
         {
             dotGitDirectory = new Lazy<string>(this.GetDotGitDirectory);
             projectRootDirectory = new Lazy<string>(this.GetProjectRootDirectory);
             dynamicGitRepositoryPath = new Lazy<string>(this.GetDynamicGitRepositoryPath);
+            gitRootPath = new Lazy<string>(this.GetGitRootPath);
         }
 
         public string WorkingDirectory { get; set; }
 
         public string DotGitDirectory => dotGitDirectory.Value;
         public string ProjectRootDirectory => projectRootDirectory.Value;
         public string DynamicGitRepositoryPath => dynamicGitRepositoryPath.Value;
+        public string GitRootPath => gitRootPath.Value;
 
         public AssemblyInfoData AssemblyInfo { get; } = new AssemblyInfoData();
         public AuthenticationInfo Authentication { get; } = new AuthenticationInfo();

diff --git a/src/GitVersionCore/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs b/src/GitVersionCore/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs
@@ -141,8 +141,7 @@ private List<string> CalculateDirectoryContents(string root)
 
         private string GetRepositorySnapshotHash()
         {
-            var isDynamicRepo = !string.IsNullOrWhiteSpace(options.Value.DynamicGitRepositoryPath);
-            using var repo = new Repository(isDynamicRepo ? options.Value.DotGitDirectory : options.Value.ProjectRootDirectory);
+            using var repo = new Repository(options.Value.GitRootPath);
 
             var head = repo.Head;
             if (head.Tip == null)