Merge 44b7815b62 into ac59398561

2 years ago · e1b045a734
parent ac59398561 44b7815b62
commit e1b045a734
2 changed files with 8 additions and 6 deletions
--- a/dist/index.js
+++ b/dist/index.js
@ -9387,8 +9387,10 @@ function prepareExistingDirectory(git, repositoryPath, repositoryUrl, clean, ref
            remove = true;
        }
        // Fetch URL does not match
-        else if (!fsHelper.directoryExistsSync(path.join(repositoryPath, '.git')) ||
-            repositoryUrl !== (yield git.tryGetFetchUrl())) {
+        else if (!fsHelper.directoryExistsSync(path.join(repositoryPath, '.git'))) {
+            remove = clean;
+        }
+        else if (repositoryUrl !== (yield git.tryGetFetchUrl())) {
            remove = true;
        }
        else {
--- a/src/git-directory-helper.ts
+++ b/src/git-directory-helper.ts
@ -24,10 +24,10 @@ export async function prepareExistingDirectory(
    remove = true
  }
  // Fetch URL does not match
-  else if (
-    !fsHelper.directoryExistsSync(path.join(repositoryPath, '.git')) ||
-    repositoryUrl !== (await git.tryGetFetchUrl())
-  ) {
+  else if (!fsHelper.directoryExistsSync(path.join(repositoryPath, '.git'))) {
+    remove = clean
+  }
+  else if (repositoryUrl !== (await git.tryGetFetchUrl())) {
    remove = true
  } else {
    // Delete any index.lock and shallow.lock left by a previously canceled run or crashed git process