Dynamic repo is now updated properly when it exists

Author: JakeGinnivan

GitVersionCore/BuildServers/GitHelper.cs

@@ -12,7 +12,11 @@ public static class GitHelper
         public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication, bool noFetch)
         {
             //If noFetch is enabled, then GitVersion will assume that the git repository is normalized before execution, so that fetching from remotes is not required.
-            if (noFetch) return;
+            if (noFetch)
+            {
+                Logger.WriteInfo("Skipping fetching");
+                return;
+            }
 
             using (var repo = new Repository(gitDirectory))
             {

GitVersionExe.Tests/GitPreparerTests.cs

@@ -78,6 +78,57 @@ public void WorksCorrectlyWithRemoteRepository(string branchName, string expecte
         }
     }
 
+    [Test]
+    public void UpdatesExistingDynamicRepository()
+    {
+        var repoName = Guid.NewGuid().ToString();
+        var tempPath = Path.GetTempPath();
+        var tempDir = Path.Combine(tempPath, repoName);
+        Directory.CreateDirectory(tempDir);
+        string dynamicRepositoryPath = null;
+
+        try
+        {
+            using (var mainRepositoryFixture = new EmptyRepositoryFixture(new Config()))
+            {
+                mainRepositoryFixture.Repository.MakeCommits(5);
+                mainRepositoryFixture.Repository.CreateFileAndCommit("TestFile.txt");
+
+                mainRepositoryFixture.Repository.CreateBranch(SpecificBranchName);
+
+                var arguments = new Arguments
+                {
+                    TargetPath = tempDir,
+                    TargetUrl = mainRepositoryFixture.RepositoryPath
+                };
+
+                // Copy contents into working directory
+                File.Copy(Path.Combine(mainRepositoryFixture.RepositoryPath, "TestFile.txt"), Path.Combine(tempDir, "TestFile.txt"));
+                arguments.TargetBranch = "master";
+
+                var gitPreparer = new GitPreparer(arguments);
+                gitPreparer.InitialiseDynamicRepositoryIfNeeded();
+                dynamicRepositoryPath = gitPreparer.GetDotGitDirectory();
+
+                var newCommit = mainRepositoryFixture.Repository.MakeACommit();
+                gitPreparer.InitialiseDynamicRepositoryIfNeeded();
+
+                using (var repository = new Repository(dynamicRepositoryPath))
+                {
+                    mainRepositoryFixture.DumpGraph();
+                    repository.DumpGraph();
+                    repository.Commits.ShouldContain(c => c.Sha == newCommit.Sha);
+                }
+            }
+        }
+        finally
+        {
+            Directory.Delete(tempDir, true);
+            if (dynamicRepositoryPath != null)
+                DeleteHelper.DeleteGitRepository(dynamicRepositoryPath);
+        }
+    }
+
     [Test]
     public void PicksAnotherDirectoryNameWhenDynamicRepoFolderTaken()
     {

GitVersionExe/GitPreparer.cs

@@ -83,7 +83,19 @@ static string CreateDynamicRepository(string targetPath, Authentication authenti
             var gitDirectory = Path.Combine(targetPath, ".git");
             if (Directory.Exists(targetPath))
             {
-                Logger.WriteInfo("Git repository already exists at {0}, skipping clone");
+                Logger.WriteInfo(string.Format("Git repository already exists at {0}", targetPath));
+                GitHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch);
+                Logger.WriteInfo(string.Format("Updating branch '{0}'", targetBranch));
+                using (var repo = new Repository(targetPath))
+                {
+                    var targetGitBranch = repo.Branches[targetBranch];
+                    var trackedBranch = targetGitBranch.TrackedBranch;
+                    if (trackedBranch == null)
+                        throw new InvalidOperationException(string.Format("Expecting {0} to have a remote tracking branch", targetBranch));
+                    
+                    targetGitBranch.Checkout();
+                    repo.Reset(ResetMode.Hard, trackedBranch.Tip);
+                }
 
                 return gitDirectory;
             }
@@ -105,7 +117,6 @@ static string CreateDynamicRepository(string targetPath, Authentication authenti
             Repository.Clone(repositoryUrl, gitDirectory,
                 new CloneOptions
                 {
-                    IsBare = true,
                     Checkout = false,
                     CredentialsProvider = (url, usernameFromUrl, types) => credentials
                 });