Use default retry count (5) for locked files

GitTools · Feb 7, 2021 · 983238b · 983238b
1 parent b66ac01
commit 983238b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/GitVersion.Core/Core/GitPreparer.cs b/src/GitVersion.Core/Core/GitPreparer.cs
@@ -330,7 +330,7 @@ private void CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(string remoteName
                     }
                     var remoteRefTipId = remoteTrackingReference.ReferenceTargetId;
                     log.Info($"Updating local ref '{localRef.Name.Canonical}' to point at {remoteRefTipId}.");
-                    new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => repository.Refs.UpdateTarget(localRef, remoteRefTipId), maxRetries: 6).ExecuteAsync().Wait();
+                    new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => repository.Refs.UpdateTarget(localRef, remoteRefTipId)).ExecuteAsync().Wait();
                     continue;
                 }
 
@@ -383,7 +383,7 @@ public void EnsureLocalBranchExistsForCurrentBranch(IRemote remote, string curre
                 log.Info(isBranch ? $"Updating local branch {referenceName} to point at {repoTip}"
                     : $"Updating local branch {referenceName} to match ref {currentBranch}");
                 var localRef = repository.Refs[localCanonicalName];
-                new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => repository.Refs.UpdateTarget(localRef, repoTipId), maxRetries: 6).ExecuteAsync().Wait();
+                new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => repository.Refs.UpdateTarget(localRef, repoTipId)).ExecuteAsync().Wait();
             }
 
             repository.Checkout(localCanonicalName);

diff --git a/src/GitVersion.Core/Model/VersionVariables.cs b/src/GitVersion.Core/Model/VersionVariables.cs
@@ -166,7 +166,7 @@ public static VersionVariables FromJson(string json)
 
         public static VersionVariables FromFile(string filePath, IFileSystem fileSystem, ILog log)
         {
-            var retryOperation = new OperationWithExponentialBackoff<IOException, VersionVariables>(new ThreadSleep(), null, () => FromFileInternal(filePath, fileSystem), maxRetries: 6);
+            var retryOperation = new OperationWithExponentialBackoff<IOException, VersionVariables>(new ThreadSleep(), null, () => FromFileInternal(filePath, fileSystem));
 
             var versionVariables = retryOperation.ExecuteAsync().Result;
             return versionVariables;

diff --git a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
@@ -38,7 +38,7 @@ public void Execute(VersionVariables variables, OutputContext context)
             }
             if (gitVersionOptions.Output.Contains(OutputType.File))
             {
-                var retryOperation = new OperationWithExponentialBackoff<IOException>(new ThreadSleep(), log, () => fileSystem.WriteAllText(context.OutputFile, variables.ToString()), maxRetries: 6);
+                var retryOperation = new OperationWithExponentialBackoff<IOException>(new ThreadSleep(), log, () => fileSystem.WriteAllText(context.OutputFile, variables.ToString()));
                 retryOperation.ExecuteAsync().Wait();
             }
             if (gitVersionOptions.Output.Contains(OutputType.Json))

diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs
@@ -58,7 +58,7 @@ public ICommit FindMergeBase(ICommit commit, ICommit otherCommit)
             {
                 var mergeBase = repositoryInstance.ObjectDatabase.FindMergeBase((Commit)commit, (Commit)otherCommit);
                 return new Commit(mergeBase);
-            }, 6).ExecuteAsync().Result;
+            }).ExecuteAsync().Result;
         }
 
         public int GetNumberOfUncommittedChanges()
@@ -91,7 +91,7 @@ public int GetNumberOfUncommittedChanges()
                 DiffTargets.Index | DiffTargets.WorkingDirectory);
 
                 return changes.Count;
-            }, 6).ExecuteAsync().Result;
+            }).ExecuteAsync().Result;
         }
         public void CreateBranchForPullRequestBranch(AuthenticationInfo auth)
         {
@@ -151,7 +151,7 @@ public void CreateBranchForPullRequestBranch(AuthenticationInfo auth)
                     var message = $"Remote tip '{canonicalName}' from remote '{remote.Url}' doesn't look like a valid pull request.";
                     throw new WarningException(message);
                 }
-            }, 6).ExecuteAsync().Wait();
+            }).ExecuteAsync().Wait();
         }
         public void Clone(string sourceUrl, string workdirPath, AuthenticationInfo auth)
         {
@@ -161,7 +161,7 @@ public void Clone(string sourceUrl, string workdirPath, AuthenticationInfo auth)
                 {
                     var path = Repository.Clone(sourceUrl, workdirPath, GetCloneOptions(auth));
                     log.Info($"Returned path after repository clone: {path}");
-                }, 6).ExecuteAsync().Wait();
+                }).ExecuteAsync().Wait();
             }
             catch (LibGit2SharpException ex)
             {
@@ -184,12 +184,12 @@ public void Clone(string sourceUrl, string workdirPath, AuthenticationInfo auth)
         }
         public void Checkout(string commitOrBranchSpec)
         {
-            new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => Commands.Checkout(repositoryInstance, commitOrBranchSpec), 6).ExecuteAsync().Wait();
+            new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => Commands.Checkout(repositoryInstance, commitOrBranchSpec)).ExecuteAsync().Wait();
         }
 
         public void Fetch(string remote, IEnumerable<string> refSpecs, AuthenticationInfo auth, string logMessage)
         {
-            new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => Commands.Fetch((Repository)repositoryInstance, remote, refSpecs, GetFetchOptions(auth), logMessage), 6).ExecuteAsync().Wait();
+            new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => Commands.Fetch((Repository)repositoryInstance, remote, refSpecs, GetFetchOptions(auth), logMessage)).ExecuteAsync().Wait();
         }
         internal static string Discover(string path) => Repository.Discover(path);